Author: chaoflow Date: Tue Feb 28 00:06:46 2012 New Revision: 32642 URL: https://nixos.org/websvn/nix/?rev=32642&sc=1
Log: Revert "enable preConfigure for python packages again" This reverts commit a513314290ba0d78400ea4902301f421e0fecdd2. Modified: nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/generic/default.nix Modified: nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/generic/default.nix ============================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/generic/default.nix Tue Feb 28 00:06:42 2012 (r32641) +++ nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/generic/default.nix Tue Feb 28 00:06:46 2012 (r32642) @@ -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 @@ # 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; _______________________________________________ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits