diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh index 9f3803f791b..65f3229ca7c 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/python-modules/generic/wrap.sh @@ -15,14 +15,6 @@ wrapPythonProgramsIn() { _addToPythonPath $i done - program_PYTHONPATH='$( - # activate site if installed - bindir=$(dirname "$0") - pysite="$bindir/pysite" - relpath=$(test -x "$pysite" && "$pysite" path) - echo -n ${relpath:+"$relpath":} -)'"$program_PYTHONPATH" - for i in $(find "$dir" -type f -perm +0100); do # Rewrite "#! .../env python" to "#! /nix/store/.../python". @@ -33,7 +25,7 @@ wrapPythonProgramsIn() { if head -n1 "$i" | grep -q /python; then echo "wrapping \`$i'..." wrapProgram "$i" \ - --prefix PYTHONPATH ":" "$program_PYTHONPATH" \ + --prefix PYTHONPATH ":" $program_PYTHONPATH \ --prefix PATH ":" $program_PATH fi done diff --git a/pkgs/development/python-modules/site/default.nix b/pkgs/development/python-modules/site/default.nix index c2dc99d5a43..98a14850dbe 100644 --- a/pkgs/development/python-modules/site/default.nix +++ b/pkgs/development/python-modules/site/default.nix @@ -12,16 +12,6 @@ stdenv.mkDerivation rec { dst=$out/lib/${python.libPrefix}/site-packages mkdir -p $dst cat ${./site.py} >> $dst/site.py - - # by providing content for bin/ we make sure, that python or - # some other script is linked instead of the bin/ directory - # itself. This is needed for the wrappers to make all site - # packages available if site is installed. - mkdir $out/bin - cat ${./pysite} >> $out/bin/pysite - substituteInPlace $out/bin/pysite \ - --replace PYTHON_LIB_PREFIX ${python.libPrefix} - chmod +x $out/bin/pysite ''; meta = { diff --git a/pkgs/development/python-modules/site/pysite b/pkgs/development/python-modules/site/pysite deleted file mode 100644 index b10a24014ce..00000000000 --- a/pkgs/development/python-modules/site/pysite +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -python=PYTHON_LIB_PREFIX - -case "$1" in - path) - echo $(dirname $0)/../lib/$python/site-packages - ;; - *) - echo Usage: - echo " $(basename $0) path" - exit 1 -esac