nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 15:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes to builderDefs related to PATH_DELIMITER..

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10841
This commit is contained in:
Michael Raskin 2008-02-23 07:26:34 +00:00
parent 0ca9f88ebc
commit 34d02fef81
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/misc/intltool/0.36.2.nix
View File

@ -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 = "

21
pkgs/top-level/builder-defs.nix
View File

@ -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}");