add sourcemodWithPackages, fix plugin build

1 files changed, 11 insertions, 9 deletions

diff --git a/srcds-pkgs/default.nix b/srcds-pkgs/default.nix
index 1b8294c..dc402a9 100644
--- a/srcds-pkgs/default.nix
+++ b/srcds-pkgs/default.nix
@@ -1,33 +1,35 @@
-let f = self: with self; {
+let f = self: let
   inherit (self) callPackage;
-  
+in {
   libfinite = callPackage ./bad/libfinite.nix {};
-  mysql_5_5 = pkgs.pkgsi686Linux.callPackage ./bad/mysql_5_5.nix {};
+  mysql_5_5 = self.pkgs.pkgsi686Linux.callPackage ./bad/mysql_5_5.nix {};
 
   ambuild = callPackage ./ambuild.nix {
-    inherit (pkgs.python3Packages) buildPythonPackage;
+    inherit (self.pkgs.python3Packages) buildPythonPackage;
   };
   
   hl2sdk-2013 = callPackage ./hl2sdk-2013.nix {};
 
   metamod-source = callPackage ./metamod-source.nix {
-  	hl2sdk = hl2sdk-2013;
+    hl2sdk = self.hl2sdk-2013;
   };
   sourcemod = callPackage ./sourcemod {
-  	hl2sdk = hl2sdk-2013;
+    hl2sdk = self.hl2sdk-2013;
   };
   
   buildSMPlugin = callPackage ./build-sm-plugin.nix {};
   # TODO: see if it even makes sense to abstract this hard
   # buildSMExtension = callPackage ./build-sm-extension.nix {};
 
+  sourcemodWithPlugins = callPackage ./sourcemod/with-plugins.nix {};
+
   depotdownloader-json = callPackage ./depotdownloader-json {};
 
   fetchDepotCache = callPackage ./fetchdepotcache.nix {
-    depotdownloader = depotdownloader-json;
+    depotdownloader = self.depotdownloader-json;
   };
   fetchDepotFile = callPackage ./fetchdepotfile.nix {
-    depotdownloader = depotdownloader-json;
+    depotdownloader = self.depotdownloader-json;
   };
   mkDepot = callPackage ./mkdepot.nix {};
 
@@ -52,4 +54,4 @@ let f = self: with self; {
 , recurseIntoAttrs
 , pkgs
 }:
-recurseIntoAttrs (lib.makeScope newScope (self: f self // { inherit pkgs; }))
+lib.makeScope newScope (self: f (self // { inherit pkgs; }))