public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* builderDefs: don't use param1-5.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31737
This commit is contained in:
Eelco Dolstra 2012-01-20 15:10:56 +00:00
parent 28780d27d1
commit 1e7d074f1d
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/build-support/builder-defs/builder-defs.nix
View File

@ -97,20 +97,13 @@ let inherit (builtins) head tail trace; in
# changing this ? see [1] # changing this ? see [1]
minInit = fullDepEntry (" minInit = fullDepEntry ("
${stdenv.preHook}
set -e set -e
NIX_GCC=${stdenv.gcc} NIX_GCC=${stdenv.gcc}
export SHELL=${stdenv.shell} export SHELL=${stdenv.shell}
PATH_DELIMITER=':' PATH_DELIMITER=':'
" + (if stdenv ? preHook && stdenv.preHook != null && toString stdenv.preHook != "" then
"
param1=${stdenv.param1}
param2=${stdenv.param2}
param3=${stdenv.param3}
param4=${stdenv.param4}
param5=${stdenv.param5}
source ${stdenv.preHook}
" +
"
# Set up the initial path. # Set up the initial path.
PATH= PATH=
for i in \$NIX_GCC ${toString stdenv.initialPath}; do for i in \$NIX_GCC ${toString stdenv.initialPath}; do
@ -121,8 +114,7 @@ let inherit (builtins) head tail trace; in
prefix=${if args ? prefix then (toString args.prefix) else "\$out"} prefix=${if args ? prefix then (toString args.prefix) else "\$out"}
" ") ["defNest" "defAddToSearchPath"];
else "")) ["defNest" "defAddToSearchPath"];
# if you change this rewrite using '' instead of "" to get rid of indentation in builder scripts # if you change this rewrite using '' instead of "" to get rid of indentation in builder scripts
addInputs = fullDepEntry (" addInputs = fullDepEntry ("