diff options
| author | Domen Kozar <domen@dev.si> | 2014-03-07 14:33:59 +0100 |
|---|---|---|
| committer | Domen Kozar <domen@dev.si> | 2014-03-07 14:34:06 +0100 |
| commit | fedd018d937f638494c48a9d7cae7d80842d134d (patch) | |
| tree | b9cc261f07a0c999cac61ab152f243c3016dfac6 /pkgs/development/python-modules | |
| parent | 8477605a516e0077524ec9640c0bf72628b4320f (diff) | |
| download | nixlib-fedd018d937f638494c48a9d7cae7d80842d134d.tar nixlib-fedd018d937f638494c48a9d7cae7d80842d134d.tar.gz nixlib-fedd018d937f638494c48a9d7cae7d80842d134d.tar.bz2 nixlib-fedd018d937f638494c48a9d7cae7d80842d134d.tar.lz nixlib-fedd018d937f638494c48a9d7cae7d80842d134d.tar.xz nixlib-fedd018d937f638494c48a9d7cae7d80842d134d.tar.zst nixlib-fedd018d937f638494c48a9d7cae7d80842d134d.zip | |
fix pypy and pypyPackages
Diffstat (limited to 'pkgs/development/python-modules')
| -rw-r--r-- | pkgs/development/python-modules/generic/wrap.sh | 4 | ||||
| -rw-r--r-- | pkgs/development/python-modules/setuptools/default.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh index a7c839799b1f..bd1f526900a5 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/python-modules/generic/wrap.sh @@ -5,7 +5,7 @@ wrapPythonPrograms() { wrapPythonProgramsIn() { local dir="$1" local pythonPath="$2" - local python="$(type -p python)" + local python="@executable@" local i declare -A pythonPathsSeen=() @@ -22,7 +22,7 @@ wrapPythonProgramsIn() { sed -i "$i" -e "1 s^.*/env[ ]*python^#! $python^" fi - if head -n1 "$i" | grep -q /python; then + if head -n1 "$i" | grep -q /@executable_name@; then # dont wrap EGG-INFO scripts since they are called from python if echo "$i" | grep -v EGG-INFO/scripts; then echo "wrapping \`$i'..." diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 35630be22553..e33c815d23bc 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { dst=$out/lib/${python.libPrefix}/site-packages mkdir -p $dst PYTHONPATH="$dst:$PYTHONPATH" - ${python}/bin/${python.executable} setup.py install --prefix=$out + ${python}/bin/${python.executable} setup.py install --prefix=$out --install-lib=$out/lib/${python.libPrefix}/site-packages wrapPythonPrograms ''; |