Merge https://github.com/NixOS/nixpkgs

1 files changed, 7 insertions, 2 deletions

diff --git a/nixpkgs/pkgs/development/interpreters/python/python-packages-base.nix b/nixpkgs/pkgs/development/interpreters/python/python-packages-base.nix
index 6a723413c850..91ca84b34b83 100644
--- a/nixpkgs/pkgs/development/interpreters/python/python-packages-base.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/python-packages-base.nix
@@ -32,12 +32,17 @@ let
       }
       else result;
 
-  buildPythonPackage = makeOverridablePythonPackage (lib.makeOverridable (callPackage ./mk-python-derivation.nix {
+  mkPythonDerivation = if python.isPy3k then
+    ./mk-python-derivation.nix
+  else
+    ./python2/mk-python-derivation.nix;
+
+  buildPythonPackage = makeOverridablePythonPackage (lib.makeOverridable (callPackage mkPythonDerivation {
     inherit namePrefix;     # We want Python libraries to be named like e.g. "python3.6-${name}"
     inherit toPythonModule; # Libraries provide modules
   }));
 
-  buildPythonApplication = makeOverridablePythonPackage (lib.makeOverridable (callPackage ./mk-python-derivation.nix {
+  buildPythonApplication = makeOverridablePythonPackage (lib.makeOverridable (callPackage mkPythonDerivation {
     namePrefix = "";        # Python applications should not have any prefix
     toPythonModule = x: x;  # Application does not provide modules.
   }));