From baa91501304dec0e6091411210f3f4a2a19a923a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 7 Dec 2010 11:41:25 +0000
Subject: [PATCH] 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.

svn path=/nixpkgs/trunk/; revision=25021
---
 pkgs/development/tools/build-managers/scons/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix
index 4e9edbde33a..9d6ab6ba815 100644
--- a/pkgs/development/tools/build-managers/scons/default.nix
+++ b/pkgs/development/tools/build-managers/scons/default.nix
@@ -13,16 +13,15 @@ stdenv.mkDerivation {
     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/";