diff options
author | Robert Scott <code@humanleg.org.uk> | 2017-05-25 20:56:25 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-05-27 14:25:08 +0200 |
commit | 45ac7700fa6aeedc088124aab863a43d476512b8 (patch) | |
tree | 6f3a4b992bf9b51389ab8a5beacff27e91ab3b36 /pkgs/development/interpreters/python/mk-python-derivation.nix | |
parent | c10af9e744c91dff1ccc07a52a0b57d1e4d339f3 (diff) |
mkPythonDerivation: obey a dontWrapPythonPrograms attribute
This should allow a python derivation to disable possibly overzealous python program wrapping without having to override the whole fixupPhase
Diffstat (limited to 'pkgs/development/interpreters/python/mk-python-derivation.nix')
-rw-r--r-- | pkgs/development/interpreters/python/mk-python-derivation.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 959c8a8070bb1..bc586e0b3cee8 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -37,6 +37,9 @@ # generated binaries. , makeWrapperArgs ? [] +# Skip wrapping of python programs altogether +, dontWrapPythonPrograms ? false + , meta ? {} , passthru ? {} @@ -69,7 +72,7 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "checkInputs" doCheck = false; doInstallCheck = doCheck; - postFixup = '' + postFixup = lib.optionalString (!dontWrapPythonPrograms) '' wrapPythonPrograms '' + lib.optionalString catchConflicts '' # Check if we have two packages with the same name in the closure and fail. |