From 45ac7700fa6aeedc088124aab863a43d476512b8 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 25 May 2017 20:56:25 +0100 Subject: 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 --- pkgs/development/interpreters/python/mk-python-derivation.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 959c8a8070bb..bc586e0b3cee 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. -- cgit 1.4.1