From a4ded477764ba35cb4e185f82af27fb43b46cc82 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Thu, 29 Nov 2012 15:29:41 +0100 Subject: [PATCH] include offlineDistutils in preConfigure instead of configurePhase --- .../development/python-modules/generic/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index a2c3627cd633..e9c51c3b87f2 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -22,6 +22,8 @@ easy_install --always-unzip --prefix="$out" . '' +, preConfigure ? "true" + , buildPhase ? "true" , doCheck ? true @@ -32,8 +34,6 @@ python setup.py test runHook postCheck '' -, configurePhase ? "true" - , postInstall ? "" , ... } @ attrs: @@ -48,12 +48,12 @@ python.stdenv.mkDerivation (attrs // { buildInputStrings = map toString buildInputs; - configurePhase = '' - export PYTHONPATH="${offlineDistutils}/lib/${python.libPrefix}:$PYTHONPATH" - ${configurePhase} - ''; + pythonPath = [ setuptools ] ++ pythonPath; - pythonPath = [ setuptools] ++ pythonPath; + preConfigure = '' + PYTHONPATH="${offlineDistutils}/lib/${python.libPrefix}/site-packages:$PYTHONPATH" + ${preConfigure} + ''; installPhase = '' mkdir -p "$out/lib/${python.libPrefix}/site-packages"