Revert "removal of deps' scripts only if easy-install.pth exists"

This reverts commit a74507f63e2af67cf64dc3e67bfbf2771120f67e.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32655
This commit is contained in:
Florian Friesdorf 2012-02-28 00:07:30 +00:00
parent 2d2c8b3e59
commit 4b4f6ece3e

View File

@ -28,19 +28,15 @@
# install the current package with easy_install.pth including dependencies # install the current package with easy_install.pth including dependencies
python setup.py install --prefix="$out" python setup.py install --prefix="$out"
# plain distutils knows no dependencies # remove console_scripts again, because they were created for deps, too
eapth="$out"/lib/${python.libPrefix}/site-packages/easy-install.pth rm -Rf "$out"/bin
if [ -e "$eapth" ]; then
# 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, # run easy_install to generate scripts for the current package,
# it won't reinstall # it won't reinstall
easy_install --prefix="$out" . easy_install --prefix="$out" .
# move colliding easy_install.pth to specifically named one # move colliding easy_install.pth to specifically named one
mv "$eapth" $(dirname "$eapth")/${name}.pth mv "$out/lib/${python.libPrefix}/site-packages/"{easy-install.pth,${name}.pth}
fi
# These cause collisions and our output is not a site anyway # These cause collisions and our output is not a site anyway
# If you need a site, install python-site # If you need a site, install python-site