From 013c915777d2c0580a11cbfee902e1d8676da9c1 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 28 Feb 2012 00:06:46 +0000 Subject: [PATCH] Revert "enable preConfigure for python packages again" This reverts commit a513314290ba0d78400ea4902301f421e0fecdd2. svn path=/nixpkgs/branches/stdenv-updates/; revision=32642 --- pkgs/development/python-modules/generic/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index a00699a4bbd..8197e5e7431 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -17,8 +17,6 @@ # pollute the user environment. pythonPath ? [] -, preConfigure ? "true" - # distutils registers dependencies in .pth (good) but also creates # console_scripts for dependencies in bin/ (bad). easy_install # creates no scripts for dependencies (good) but does not register @@ -86,7 +84,7 @@ python.stdenv.mkDerivation (attrs // { # enable pth files for dependencies export PYTHONPATH="${site}/lib/${python.libPrefix}/site-packages:$PYTHONPATH" - '' + preConfigure; + ''; # XXX: I think setuptools is not needed here pythonPath = [ setuptools site ] ++ pythonPath;