Author: chaoflow
Date: Tue Feb 28 00:07:30 2012
New Revision: 32655
URL: https://nixos.org/websvn/nix/?rev=32655&sc=1
Log:
Revert "removal of deps' scripts only if easy-install.pth exists"
This reverts commit a74507f63e2af67cf64dc3e67bfbf2771120f67e.
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:07:27 2012 (r32654)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/generic/default.nix
Tue Feb 28 00:07:30 2012 (r32655)
@@ -28,19 +28,15 @@
# install the current package with easy_install.pth including
dependencies
python setup.py install --prefix="$out"
- # plain distutils knows no dependencies
- eapth="$out"/lib/${python.libPrefix}/site-packages/easy-install.pth
- if [ -e "$eapth" ]; then
- # remove console_scripts again, because they were created for deps,
too
- rm -Rf "$out"/bin
+ # remove console_scripts again, because they were created for deps, too
+ rm -Rf "$out"/bin
- # run easy_install to generate scripts for the current package,
- # it won't reinstall
- easy_install --prefix="$out" .
+ # run easy_install to generate scripts for the current package,
+ # it won't reinstall
+ easy_install --prefix="$out" .
- # move colliding easy_install.pth to specifically named one
- mv "$eapth" $(dirname "$eapth")/${name}.pth
- fi
+ # move colliding easy_install.pth to specifically named one
+ mv
"$out/lib/${python.libPrefix}/site-packages/"{easy-install.pth,${name}.pth}
# These cause collisions and our output is not a site anyway
# If you need a site, install python-site
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
