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

added note that steps in builderDefs should be rewritten using '' syntax

Browse Source 
in order to strip spaces

svn path=/nixpkgs/trunk/; revision=17019
This commit is contained in:
Marc Weber 2009-09-10 16:57:29 +00:00
parent 60aa746f6b
commit d3cb19bd41
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,6 +35,7 @@ let inherit (builtins) head tail trace; in
else (abort "unknown archive type : ${s}")); else (abort "unknown archive type : ${s}"));
# changing this ? see [1]
defAddToSearchPath = fullDepEntry (" defAddToSearchPath = fullDepEntry ("
addToSearchPathWithCustomDelimiter() { addToSearchPathWithCustomDelimiter() {
local delimiter=\$1 local delimiter=\$1
@ -57,6 +58,7 @@ let inherit (builtins) head tail trace; in
} }
") ["defNest"]; ") ["defNest"];
# changing this ? see [1]
defNest = noDepEntry (" defNest = noDepEntry ("
nestingLevel=0 nestingLevel=0
@ -86,6 +88,8 @@ let inherit (builtins) head tail trace; in
trap \"closeNest\" EXIT trap \"closeNest\" EXIT
"); ");
# changing this ? see [1]
minInit = fullDepEntry (" minInit = fullDepEntry ("
set -e set -e
NIX_GCC=${stdenv.gcc} NIX_GCC=${stdenv.gcc}
@ -114,6 +118,7 @@ let inherit (builtins) head tail trace; in
" "
else "")) ["defNest" "defAddToSearchPath"]; else "")) ["defNest" "defAddToSearchPath"];
# if you change this rewrite using '' instead of "" to get rid of indentation in builder scripts
addInputs = fullDepEntry (" addInputs = fullDepEntry ("
# Recursively find all build inputs. # Recursively find all build inputs.
findInputs() findInputs()
@ -180,6 +185,7 @@ let inherit (builtins) head tail trace; in
PATH=\$_PATH\${_PATH:+\"\${PATH_DELIMITER}\"}\$PATH PATH=\$_PATH\${_PATH:+\"\${PATH_DELIMITER}\"}\$PATH
") ["minInit"]; ") ["minInit"];
# changing this ? see [1]
defEnsureDir = fullDepEntry (" defEnsureDir = fullDepEntry ("
# Ensure that the given directories exists. # Ensure that the given directories exists.
ensureDir() { ensureDir() {
@ -190,6 +196,7 @@ let inherit (builtins) head tail trace; in
} }
") ["minInit"]; ") ["minInit"];
# changing this ? see [1]
toSrcDir = s : fullDepEntry ((if (archiveType s) == "tar" then " toSrcDir = s : fullDepEntry ((if (archiveType s) == "tar" then "
tar xvf '${s}' tar xvf '${s}'
cd \"\$(tar tf '${s}' | head -1 | sed -e 's@/.*@@' )\" cd \"\$(tar tf '${s}' | head -1 | sed -e 's@/.*@@' )\"
@ -237,15 +244,18 @@ let inherit (builtins) head tail trace; in
configureCommand = attrByPath ["configureCommand"] "./configure" args; configureCommand = attrByPath ["configureCommand"] "./configure" args;
# changing this ? see [1]
doConfigure = fullDepEntry (" doConfigure = fullDepEntry ("
${configureCommand} --prefix=\"\$prefix\" ${toString configureFlags} ${configureCommand} --prefix=\"\$prefix\" ${toString configureFlags}
") ["minInit" "addInputs" "doUnpack"]; ") ["minInit" "addInputs" "doUnpack"];
# changing this ? see [1]
doIntltool = fullDepEntry (" doIntltool = fullDepEntry ("
mkdir -p config mkdir -p config
intltoolize --copy --force intltoolize --copy --force
") ["minInit" "addInputs" "doUnpack"]; ") ["minInit" "addInputs" "doUnpack"];
# changing this ? see [1]
doAutotools = fullDepEntry (" doAutotools = fullDepEntry ("
mkdir -p config mkdir -p config
libtoolize --copy --force libtoolize --copy --force
@ -256,12 +266,14 @@ let inherit (builtins) head tail trace; in
autoconf autoconf
")["minInit" "addInputs" "doUnpack"]; ")["minInit" "addInputs" "doUnpack"];
# changing this ? see [1]
doMake = fullDepEntry (" doMake = fullDepEntry ("
make ${toString makeFlags} make ${toString makeFlags}
") ["minInit" "addInputs" "doUnpack"]; ") ["minInit" "addInputs" "doUnpack"];
doUnpack = toSrcDir (toString src); doUnpack = toSrcDir (toString src);
# changing this ? see [1]
installPythonPackage = fullDepEntry (" installPythonPackage = fullDepEntry ("
python setup.py install --prefix=\"\$prefix\" python setup.py install --prefix=\"\$prefix\"
") ["minInit" "addInputs" "doUnpack"]; ") ["minInit" "addInputs" "doUnpack"];
@ -276,10 +288,12 @@ let inherit (builtins) head tail trace; in
python configure.py -b "$prefix/bin" -d "$(toPythonPath "$prefix")" -v "$prefix/share/sip" ${toString configureFlags} python configure.py -b "$prefix/bin" -d "$(toPythonPath "$prefix")" -v "$prefix/share/sip" ${toString configureFlags}
'') ["minInit" "addInputs" "doUnpack"]; '') ["minInit" "addInputs" "doUnpack"];
# changing this ? see [1]
doMakeInstall = fullDepEntry (" doMakeInstall = fullDepEntry ("
make ${toString (attrByPath ["makeFlags"] "" args)} "+ make ${toString (attrByPath ["makeFlags"] "" args)} "+
"${toString (attrByPath ["installFlags"] "" args)} install") ["doMake"]; "${toString (attrByPath ["installFlags"] "" args)} install") ["doMake"];
# changing this ? see [1]
doForceShare = fullDepEntry (" doForceShare = fullDepEntry ("
ensureDir \"\$prefix/share\" ensureDir \"\$prefix/share\"
for d in ${toString forceShare}; do for d in ${toString forceShare}; do
@ -320,6 +334,7 @@ let inherit (builtins) head tail trace; in
"echo export ${head l}='\"'\"\\\$${head l}:${head (tail l)}\"'\"';\n" + "echo export ${head l}='\"'\"\\\$${head l}:${head (tail l)}\"'\"';\n" +
envAdderList (tail (tail l)); envAdderList (tail (tail l));
# changing this ? see [1]
wrapEnv = cmd: env: " wrapEnv = cmd: env: "
mv \"${cmd}\" \"${cmd}-orig\"; mv \"${cmd}\" \"${cmd}-orig\";
touch \"${cmd}\"; touch \"${cmd}\";
@ -533,3 +548,6 @@ let inherit (builtins) head tail trace; in
sha256 = srcInfo.hash; sha256 = srcInfo.hash;
}; };
}) // args }) // args
# [1]: rewrite using '' instead of " so that indentation gets stripped. It's
# only about some spaces but in the end they will sum up