diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2017-12-10 14:20:38 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-12-10 20:40:34 +0100 |
commit | a3349304909aee736bc9a9ad1c35d698a27df23d (patch) | |
tree | 3c931d919c248e6c275cca44c0d5d283d3e95a19 /pkgs/development/interpreters/python/mk-python-derivation.nix | |
parent | 87317bab0a796b3c8301f27acfbf48a782d5dde0 (diff) |
Python: rewrite requiredPythonModules. Add requiredPythonModules attribute to derivation
Diffstat (limited to 'pkgs/development/interpreters/python/mk-python-derivation.nix')
-rw-r--r-- | pkgs/development/interpreters/python/mk-python-derivation.nix | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index a0cac7d1ddda8..b92167ce42d67 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -7,7 +7,7 @@ , unzip , ensureNewerSourcesHook # Whether the derivation provides a Python module or not. -, pythonModule +, toPythonModule , namePrefix }: @@ -54,7 +54,7 @@ if disabled then throw "${name} not supported for interpreter ${python.executable}" else -python.stdenv.mkDerivation (builtins.removeAttrs attrs [ +toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attrs [ "disabled" "checkInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" ] // { @@ -84,14 +84,9 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs [ ${python.interpreter} ${./catch_conflicts}/catch_conflicts.py '' + attrs.postFixup or ''''; - passthru = { - inherit python; # The python interpreter - inherit pythonModule; - } // passthru; - meta = { # default to python's platforms platforms = python.meta.platforms; isBuildPythonPackage = python.meta.platforms; } // meta; -}) +})) |