From afa04f45764ecb53aaa88b7defada3fbe5704e74 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 30 Jun 2009 18:51:01 +0000
Subject: [PATCH] Updated scons to version 1.2.0.

svn path=/nixpkgs/trunk/; revision=16111
---
 .../tools/build-managers/scons/default.nix    | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix
index 82d675acb32..bc941ef102a 100644
--- a/pkgs/development/tools/build-managers/scons/default.nix
+++ b/pkgs/development/tools/build-managers/scons/default.nix
@@ -1,8 +1,18 @@
 {stdenv, fetchurl, python, makeWrapper}:
 
 stdenv.mkDerivation rec {
-  name = "scons-${version}";
-  version = "1.0.0";
+  version = "1.2.0";
+  name = "scons-" + version;
+
+  src = fetchurl {
+    url = "mirror://sourceforge/scons/${name}.tar.gz";
+    sha256 = "2806451e02a42789decb6d08098b798b6b81a0a39d8d3b2fbdd3fe84ebd8a246";
+  };
+
+  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 --set PYTHONPATH \"$(toPythonPath $out):$PYTHONPATH:\$PYTHONPATH\"; done";
+
   meta = {
     homepage = "http://scons.org/";
     description = "An improved, cross-platform substitute for Make";
@@ -15,15 +25,4 @@ stdenv.mkDerivation rec {
        software.
     '';
   };
-  src = fetchurl {
-    url = "mirror://sourceforge/scons/scons-${version}.tar.gz";
-    sha256 = "13nyy7n0iddr91r136fj15brni8r5f3j6cx57w5aqfvmnb0lv51x";
-  };
-  propagatedBuildInputs = [python makeWrapper];
-  buildPhase = "true";
-  installPhase =
-  ''
-     python setup.py install --prefix=$out --install-lib=$(toPythonPath $out) --hardlink-scons -O1
-     for n in $out/bin/*; do wrapProgram $n --set PYTHONPATH "$(toPythonPath $out):$PYTHONPATH:\$PYTHONPATH"; done
-  '';
 }