Install wrappers for Twisted binaries to ensure a correct ${PYTHONPATH}.

svn path=/nixpkgs/trunk/; revision=12891
This commit is contained in:
Peter Simons 2008-09-19 10:07:36 +00:00
parent 656127373d
commit f3ae22fa5f
2 changed files with 9 additions and 8 deletions

View File

@ -1,16 +1,17 @@
{stdenv, fetchurl, python, ZopeInterface}:
{stdenv, fetchurl, python, ZopeInterface, makeWrapper}:
stdenv.mkDerivation {
name = "twisted-8.1.0";
src = fetchurl {
url = http://tmrc.mit.edu/mirror/twisted/Twisted/8.1/Twisted-8.1.0.tar.bz2;
sha256 = "0q25zbr4xzknaghha72mq57kh53qw1bf8csgp63pm9sfi72qhirl";
};
buildInputs = [python];
propagatedBuildInputs = [ZopeInterface];
installPhase = "PYTHONPATH=$(toPythonPath $out):$PYTHONPATH; python ./setup.py install --prefix=$out";
propagatedBuildInputs = [ZopeInterface makeWrapper];
buildPhase = "true";
installCommand =
''
python ./setup.py install --prefix=$out --install-lib=$(toPythonPath $out) -O1
for n in $out/bin/*; do wrapProgram $n --set PYTHONPATH "$(toPythonPath $out):$PYTHONPATH:\$PYTHONPATH"; done
'';
}

View File

@ -4602,7 +4602,7 @@ let
};
twisted = import ../development/python-modules/twisted {
inherit fetchurl stdenv python ZopeInterface;
inherit fetchurl stdenv python ZopeInterface makeWrapper;
};
ZopeInterface = import ../development/python-modules/ZopeInterface {