Author: simons
Date: Tue Dec 7 11:41:25 2010
New Revision: 25021
URL: https://svn.nixos.org/websvn/nix/?rev=25021&sc=1
Log:
pkgs/development/tools/build-managers/scons: cosmetic build improvements
- The flag "--mandir" has no effect with setup.py. Instead, "--install-data"
must be used.
- Don't generate wrappers for trivial symlink aliases in bin.
- Prefer symlinks over hard-links.
- The dependencies of this expression don't need to be propagated.
Modified:
nixpkgs/trunk/pkgs/development/tools/build-managers/scons/default.nix
Modified: nixpkgs/trunk/pkgs/development/tools/build-managers/scons/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/tools/build-managers/scons/default.nix
Tue Dec 7 00:44:29 2010 (r25020)
+++ nixpkgs/trunk/pkgs/development/tools/build-managers/scons/default.nix
Tue Dec 7 11:41:25 2010 (r25021)
@@ -13,16 +13,15 @@
sha256 = "0qk74nrnm9qlijrq6gmy8cyhjgp0gis4zx44divnr8n487d5308a";
};
+ buildInputs = [python makeWrapper];
+
preConfigure = ''
- configureFlags="--mandir=$out/share/man"
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/";;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
