Updating from trunk. I resolved simple conflicts.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
This commit is contained in:
Lluís Batlle i Rossell
2010-12-11 12:47:00 +00:00
106 changed files with 2507 additions and 484 deletions

View File

@@ -13,16 +13,15 @@ stdenv.mkDerivation {
sha256 = "0qk74nrnm9qlijrq6gmy8cyhjgp0gis4zx44divnr8n487d5308a";
};
buildInputs = [python makeWrapper];
preConfigure = ''
for i in script/*
do
for i in "script/"*; do
substituteInPlace $i --replace "/usr/bin/env python" "${python}/bin/python"
done
'';
propagatedBuildInputs = [python makeWrapper];
buildPhase = "python setup.py install --prefix=$out --install-lib=$(toPythonPath $out) --hardlink-scons -O1";
installPhase = "for n in $out/bin/*; do wrapProgram $n --suffix PYTHONPATH ':' \"$(toPythonPath $out)\"; done";
buildPhase = "python setup.py install --prefix=$out --install-data=$out/share --install-lib=$(toPythonPath $out) --symlink-scons -O1";
installPhase = "for n in $out/bin/*-${version}; do wrapProgram $n --suffix PYTHONPATH ':' \"$(toPythonPath $out)\"; done";
meta = {
homepage = "http://scons.org/";