Use callPackageWith for Python-based derivations

1 files changed, 6 insertions, 14 deletions

diff --git a/default.nix b/default.nix
index 1a2f679..3827cec 100644
--- a/default.nix
+++ b/default.nix
@@ -1,23 +1,15 @@
 { pkgs ? import <nixpkgs> {} }:
 let
-  setupPkg = { name, extraArgs ? {} }: pkgs.callPackage ./pkgs/${name}/package.nix extraArgs;
+  pythonCallPackage = pkgs.lib.callPackageWith(pkgs // pkgs.python3.pkgs);
+  setupPkg = { name, callPackage ? pkgs.callPackage, extraArgs ? {} }: callPackage ./pkgs/${name}/package.nix extraArgs;
+  pySetupPkg = { name, extraArgs ? {} }: setupPkg { inherit name extraArgs; callPackage = pythonCallPackage; };
 in
 rec {
-  miasm = setupPkg { 
-    name = "miasm";
-    extraArgs = { 
-      inherit (pkgs.python3.pkgs) buildPythonPackage;
-      inherit (pkgs.python3Packages) future pyparsing;
-    }; 
-  };
+  miasm = pySetupPkg { name = "miasm"; };
 
-  msynth = setupPkg {
+  msynth = pySetupPkg {
     name = "msynth";
-    extraArgs = { 
-      inherit (pkgs.python3.pkgs) buildPythonPackage;
-      inherit (pkgs.python3Packages) z3 future;
-      inherit miasm;
-    }; 
+    extraArgs = { inherit miasm; }; 
   };
 
   passwdqc = setupPkg { name = "passwdqc"; };