Author: eelco
Date: Fri Jan 20 15:10:56 2012
New Revision: 31737
URL: https://nixos.org/websvn/nix/?rev=31737&sc=1
Log:
* builderDefs: don't use param1-5.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/build-support/builder-defs/builder-defs.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/build-support/builder-defs/builder-defs.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/build-support/builder-defs/builder-defs.nix
Fri Jan 20 15:10:28 2012 (r31736)
+++
nixpkgs/branches/stdenv-updates/pkgs/build-support/builder-defs/builder-defs.nix
Fri Jan 20 15:10:56 2012 (r31737)
@@ -97,20 +97,13 @@
# changing this ? see [1]
minInit = fullDepEntry ("
+ ${stdenv.preHook}
+
set -e
NIX_GCC=${stdenv.gcc}
export SHELL=${stdenv.shell}
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.
PATH=
for i in \$NIX_GCC ${toString stdenv.initialPath}; do
@@ -121,8 +114,7 @@
prefix=${if args ? prefix then (toString args.prefix) else
"\$out"}
- "
- else "")) ["defNest" "defAddToSearchPath"];
+ ") ["defNest" "defAddToSearchPath"];
# if you change this rewrite using '' instead of "" to get rid of
indentation in builder scripts
addInputs = fullDepEntry ("
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
