diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2008-02-23 07:26:34 +0000 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2008-02-23 07:26:34 +0000 |
commit | 34d02fef81ce04581441bd998ac3ae83a0d40ac4 (patch) | |
tree | a02b10b73bcb720867b02a2eacd923e9bc233aa5 | |
parent | 0ca9f88ebc312f5fe039b21cc12c4c81e710bd3c (diff) |
Fixes to builderDefs related to PATH_DELIMITER..
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10841
-rw-r--r-- | pkgs/development/tools/misc/intltool/0.36.2.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/builder-defs.nix | 21 |
2 files changed, 15 insertions, 10 deletions
diff --git a/pkgs/development/tools/misc/intltool/0.36.2.nix b/pkgs/development/tools/misc/intltool/0.36.2.nix index 884c76a800c79..9147b10c3f17b 100644 --- a/pkgs/development/tools/misc/intltool/0.36.2.nix +++ b/pkgs/development/tools/misc/intltool/0.36.2.nix @@ -13,7 +13,9 @@ args : with args; stdenv.mkDerivation rec { name = "intltool-0.36.2"; builder = writeScript (name + "-builder") - (textClosure localDefs [doConfigure doMakeInstall doPropagate doForceShare]); + (textClosure localDefs [minInit addInputs doUnpack + (doDump "1") doConfigure doMakeInstall + doPropagate doForceShare]); inherit propagatedBuildInputs; meta = { description = " diff --git a/pkgs/top-level/builder-defs.nix b/pkgs/top-level/builder-defs.nix index 6b53ba76fd466..d06ebb9410327 100644 --- a/pkgs/top-level/builder-defs.nix +++ b/pkgs/top-level/builder-defs.nix @@ -75,11 +75,7 @@ args: with args; with stringsWithDeps; with lib; set -e NIX_GCC=${stdenv.gcc} export SHELL=${stdenv.shell} - # Set up the initial path. - PATH= - for i in \$NIX_GCC ${toString stdenv.initialPath}; do - PATH=\$PATH\${PATH:+:}\$i/bin - done + PATH_DELIMITER=':' " + (if ((stdenv ? preHook) && (stdenv.preHook != null) && ((toString stdenv.preHook) != "")) then " @@ -89,6 +85,13 @@ args: with args; with stringsWithDeps; with lib; param4=${stdenv.param4} param5=${stdenv.param5} source ${stdenv.preHook} + " + + " + # Set up the initial path. + PATH= + for i in \$NIX_GCC ${toString stdenv.initialPath}; do + PATH=\$PATH\${PATH:+\"\${PATH_DELIMITER}\"}\$i/bin + done export TZ=UTC @@ -137,12 +140,12 @@ args: with args; with stringsWithDeps; with lib; " else "") +(if addSbinPath then " if test -d \$1/sbin; then - export _PATH=\$_PATH\${_PATH:+:}\$1/sbin + export _PATH=\$_PATH\${_PATH:+\"\${PATH_DELIMITER}\"}\$1/sbin fi " else "") +" if test -d \$1/bin; then - export _PATH=\$_PATH\${_PATH:+:}\$1/bin + export _PATH=\$_PATH\${_PATH:+\"\${PATH_DELIMITER}\"}\$1/bin fi for i in \"\${envHooks[@]}\"; do @@ -160,7 +163,7 @@ args: with args; with stringsWithDeps; with lib; export NIX_LDFLAGS=\"-rpath \$out/lib \$NIX_LDFLAGS\" fi - PATH=\$_PATH\${_PATH:+:}\$PATH + PATH=\$_PATH\${_PATH:+\"\${PATH_DELIMITER}\"}\$PATH ") ["minInit"]; defEnsureDir = FullDepEntry (" @@ -339,7 +342,7 @@ args: with args; with stringsWithDeps; with lib; "\n cat >> $out/nix-support/setup-hook << EOF" + "\n " + "\n echo \$GHC_PACKAGE_PATH | grep -l $pkgdb &> /dev/null || \" "+ - "\n export GHC_PACKAGE_PATH=\$GHC_PACKAGE_PATH\${GHC_PACKAGE_PATH:+$PATH_DELIMITER}$pkgdb;" + + "\n export GHC_PACKAGE_PATH=\$GHC_PACKAGE_PATH\${GHC_PACKAGE_PATH:+\"\${PATH_DELIMITER}\"}$pkgdb;" + "\nEOF" + "\n}"); |