From bf1fe3aa09e4bb33ee08e21ddef7c0dfa75c6858 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 28 Feb 2012 00:07:23 +0000 Subject: [PATCH] Revert "pysite support for pythonXYFull wrapper" This reverts commit f77b9a16a9ef52951a601997593dc557a42660b9. svn path=/nixpkgs/branches/stdenv-updates/; revision=32653 --- .../interpreters/python/wrapper-builder.sh | 13 ------------- pkgs/development/interpreters/python/wrapper.nix | 1 - 2 files changed, 14 deletions(-) delete mode 100644 pkgs/development/interpreters/python/wrapper-builder.sh diff --git a/pkgs/development/interpreters/python/wrapper-builder.sh b/pkgs/development/interpreters/python/wrapper-builder.sh deleted file mode 100644 index f3353c32ef10..000000000000 --- a/pkgs/development/interpreters/python/wrapper-builder.sh +++ /dev/null @@ -1,13 +0,0 @@ -source $stdenv/setup - -preConfigure() { - PYTHONPATH='$( - # activate site if installed - bindir=$(dirname "$0") - pysite="$bindir/pysite" - relpath=$(test -x "$pysite" && "$pysite" path) - echo -n ${relpath:+"$relpath":} -)'"$PYTHONPATH" -} - -genericBuild diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index f1d2471c942e..0522a47d17b3 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -7,7 +7,6 @@ stdenv.mkDerivation { name = "python-${python.version}-wrapper"; buildInputs = [ makeWrapper ]; - builder = ./wrapper-builder.sh; propagatedBuildInputs = [ python ] ++ extraLibs; unpackPhase = "true";