Author: raskin
Date: Mon Apr 18 07:41:54 2011
New Revision: 26873
URL: https://svn.nixos.org/websvn/nix/?rev=26873&sc=1
Log:
Workaround SCons paranoia
Modified:
nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix
Modified: nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix
==============================================================================
--- nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix Sun Apr
17 20:31:23 2011 (r26872)
+++ nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix Mon Apr
18 07:41:54 2011 (r26873)
@@ -394,6 +394,19 @@
cmake -D CMAKE_INSTALL_PREFIX="$out" ${cmakeRPathFlag}${toString
cmakeFlags} ..
'') ["minInit" "addInputs" "doUnpack"];
+ doScons = fullDepEntry (''
+ ensureDir $out
+ ${if (attrByPath ["sconsCleanEnv"] false args)
+ then ""
+ else ''
+ sed -e '1iimport os' -i SConstruct
+ sed -e 's/env *= *Environment *.*/&;
env['"'"'ENV'"'"']=os.environ;/' -i SConstruct
+ ''
+ }
+ scons PREFIX=$out
+ scons PREFIX=$out install
+ '') ["minInit" "doUnpack" "addInputs" "defEnsureDir"];
+
/*debug = x:(trace x x);
debugX = x:(trace (toXML x) x);*/
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
