From 964d56e060fc930f3b401201d70e17f7e4705782 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 18 Apr 2011 07:41:54 +0000 Subject: [PATCH] Workaround SCons paranoia svn path=/nixpkgs/trunk/; revision=26873 --- pkgs/build-support/builder-defs/builder-defs.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix index b1ac3a10390..d2407a1dc68 100644 --- a/pkgs/build-support/builder-defs/builder-defs.nix +++ b/pkgs/build-support/builder-defs/builder-defs.nix @@ -394,6 +394,19 @@ let inherit (builtins) head tail trace; in 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);*/