FullDepEntry -> fullDepEntry, PackEntry -> packEntry

svn path=/nixpkgs/trunk/; revision=15662
This commit is contained in:
Marc Weber 2009-05-19 23:25:58 +00:00
parent 1500252e6f
commit 52647ea3b0
102 changed files with 177 additions and 177 deletions

View file

@ -10,7 +10,7 @@ args: with args;
};
in with localDefs;
let
postInstall = FullDepEntry ("
postInstall = fullDepEntry ("
ensureDir \$out/share/ladspa/
ln -s \$out/lib/ladspa \$out/share/ladspa/lib
") [minInit defEnsureDir];

View file

@ -12,7 +12,7 @@ in
};
in with localDefs;
let
copyFile = FullDepEntry ("
copyFile = fullDepEntry ("
ensureDir \$out/include
cp ${src} \$out/include/ladspa.h
") [minInit defEnsureDir];

View file

@ -2,7 +2,7 @@ args :
let
lib = args.lib;
fetchurl = args.fetchurl;
FullDepEntry = args.FullDepEntry;
fullDepEntry = args.fullDepEntry;
version = lib.getAttr ["version"] "9.4" args;
buildInputs = with args; [gtk glib pkgconfig
@ -38,14 +38,14 @@ rec {
phaseNames = ["doConfigure" "preBuild" "makeDocsWork"
"doMakeInstall" "doForceShare"];
makeDocsWork = FullDepEntry ''
makeDocsWork = fullDepEntry ''
# hackish way to make html docs work
h="$out/share/snd/html"; ensureDir "$h"; cp *.html "$h"
patch -p1 < ${./doc.patch}
sed "s@HTML-DIR@$h@" -i index.scm snd-help.c
'' ["defEnsureDir"];
preBuild = FullDepEntry (''
preBuild = fullDepEntry (''
cp config.log /tmp/snd-config.log
export NIX_LDFLAGS="$NIX_LDFLAGS -L${args.libX11}/lib -lX11"

View file

@ -20,7 +20,7 @@ rec {
/* doConfigure should be removed if not needed */
phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
preConfigure = a.FullDepEntry (''
preConfigure = a.fullDepEntry (''
sed -e s@/usr/@"$out/"@g -i configure $(find . -name 'Makefile*')
ensureDir $out/share/locale
'') ["doUnpack" "minInit" "defEnsureDir"];

View file

@ -23,7 +23,7 @@ args : with args; let localDefs = builderDefs.passthru.function (args // rec {
});
in with localDefs;
let
preConfigure = FullDepEntry ("
preConfigure = fullDepEntry ("
sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' "+
"-i driver/Makefile.in po/Makefile.in.in;
") ["minInit" "doUnpack"];

View file

@ -7,7 +7,7 @@ args : with args; with builderDefs {src="";} null;
};
buildInputs = [glib zlib];
configureFlags = [" --prefix=$out "];
preConfigure = FullDepEntry (''
preConfigure = fullDepEntry (''
export NIX_CFLAGS_COMPILE=$NIX_CFLAGS_COMPILE' -I${glib}/include/glib-2.0/ -I${glib}/lib/glib-2.0/include/ '
export NIX_LDFLAGS=$NIX_LDFLAGS' -lglib-2.0 '
sed -e 's@/usr/local/lib/libz\.a@${zlib}/lib/libz.a@' -i configure

View file

@ -17,11 +17,11 @@ rec {
configureFlags = [];
makeFlags = ["linux" "prefix=" "root=$out"];
preBuild = a.FullDepEntry(''
preBuild = a.fullDepEntry(''
sed -e s@/usr/@"$out/"@g -i mozplugger.c
'') ["doUnpack" "minInit"];
postInstall = a.FullDepEntry(''
postInstall = a.fullDepEntry(''
ensureDir $out/share/${name}/plugin
ln -s $out/lib/mozilla/plugins/mozplugger.so $out/share/${name}/plugin
'') ["doMakeInstall" "minInit" "defEnsureDir"];

View file

@ -30,7 +30,7 @@ rec {
+ " --with-nss-libs=${nss}/lib --with-ncurses-headers=${ncurses}/include"
+ " --enable-screensaver --disable-meanwhile --disable-nm --disable-tcl";
preBuild = FullDepEntry (''
preBuild = fullDepEntry (''
export echo=echo
'') [];
@ -45,7 +45,7 @@ rec {
homepage = http://funpidgin.sf.net;
};
} // (if externalPurple2 then {
postInstall = FullDepEntry (''
postInstall = fullDepEntry (''
ensureDir $out/lib/purple-2
cp ${args.purple2Source}/lib/purple-2/* $out/lib/purple-2/
'') ["minInit" "defEnsureDir"]; }

View file

@ -30,7 +30,7 @@ rec {
+ " --with-nss-libs=${nss}/lib --with-ncurses-headers=${ncurses}/include"
+ " --enable-screensaver --disable-meanwhile --disable-nm --disable-tcl";
preBuild = FullDepEntry (''
preBuild = fullDepEntry (''
export echo=echo
'') [];
@ -45,7 +45,7 @@ rec {
homepage = http://funpidgin.sf.net;
};
} // (if externalPurple2 then {
postInstall = FullDepEntry (''
postInstall = fullDepEntry (''
ensureDir $out/lib/purple-2
cp ${args.purple2Source}/lib/purple-2/* $out/lib/purple-2/
'') ["minInit" "defEnsureDir"]; }

View file

@ -20,7 +20,7 @@ rec {
inherit buildInputs;
configureFlags = [];
preConfigure = a.FullDepEntry (''
preConfigure = a.fullDepEntry (''
export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$(toPythonPath ${a.pyGtkGlade})/gtk-2.0"
export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$(toPythonPath ${a.pygobject})/gtk-2.0"
sed -e '/-L[$]x_libraries/d' -i configure

View file

@ -11,7 +11,7 @@ rec {
"PREFIX=$out"
];
preBuild = FullDepEntry (''
preBuild = fullDepEntry (''
ensureDir $out/bin
ln -s $(which convert) $out/bin
ln -s $(which xelatex) $out/bin
@ -25,7 +25,7 @@ rec {
sed -e 's/\(#define HEADER ".*\)12pt\(.*\)"/\116pt\2\\\\usepackage{fontspec}\\\\usepackage{xunicode}"/' -i LaTeX.h
'') ["minInit" "addInputs" "defEnsureDir" "doUnpack"];
postInstall = FullDepEntry (''
postInstall = fullDepEntry (''
ensureDir $out/lib
ensureDir $out/share/pidgin-latex
ln -s ../../lib/pidgin/LaTeX.so $out/share/pidgin-latex

View file

@ -9,7 +9,7 @@ args : with args; with builderDefs;
buildInputs = [scons pkgconfig gtk bzip2 pkgconfig libglade
openssl libX11];
configureFlags = [];
doScons = FullDepEntry (''
doScons = fullDepEntry (''
ensureDir $out
export NIX_LDFLAGS="$NIX_LDFLAGS -lX11";
scons PREFIX=$out

View file

@ -13,7 +13,7 @@ rec {
/* doConfigure should be specified separately */
phaseNames = ["doConfigure" "doPreBuild" "doMakeInstall"];
doPreBuild = FullDepEntry (''
doPreBuild = fullDepEntry (''
cp drgeo.desktop.in drgeo.desktop
'') ["minInit" "doUnpack"];

View file

@ -18,7 +18,7 @@ rec {
(pythonWrapperArguments + preservePathWrapperArguments))
];
doInstall = FullDepEntry (''
doInstall = fullDepEntry (''
for i in dot mtn highlight; do
sed -e "s@/usr/bin/$i@$(which $i)@" -i config.py.example
done

View file

@ -11,7 +11,7 @@ args : with args;
};
in with localDefs;
let
doCopy = FullDepEntry ("
doCopy = fullDepEntry ("
ensureDir \$out/share/qemu-images
cp linux-${version}.img \$out/share/qemu-images/
") [minInit doUnpack defEnsureDir];

View file

@ -2,7 +2,7 @@ args :
let
lib = args.lib;
fetchurl = args.fetchurl;
FullDepEntry = args.FullDepEntry;
fullDepEntry = args.fullDepEntry;
version = lib.getAttr ["version"] "3.3.0" args;
_buildInputs = with args; [
@ -23,10 +23,10 @@ rec {
/* doConfigure should be specified separately */
phaseNames = ["makeTools" "makeXen"];
makeTools = FullDepEntry (''make -C tools install PREFIX=$out '')
makeTools = fullDepEntry (''make -C tools install PREFIX=$out '')
["minInit" "addInputs" "doUnpack"];
makeXen = FullDepEntry (''make -C xen install PREFIX=$out '')
makeXen = fullDepEntry (''make -C xen install PREFIX=$out '')
["minInit" "addInputs" "doUnpack"];
name = "xen-" + version;

View file

@ -11,11 +11,11 @@ args : with args;
} null; /* null is a terminator for sumArgs */
in with localDefs;
let
fixPkgconfig = FullDepEntry ("
fixPkgconfig = fullDepEntry ("
ensureDir \$out/lib
ln -fs \$out/share/pkgconfig \$out/lib/pkgconfig
") [minInit doMakeInstall defEnsureDir];
fixInterpreter = FullDepEntry ("
fixInterpreter = fullDepEntry ("
sed -e 's@^#!/bin/bash@#! ${stdenv.bash}/bin/bash@' -i \$out/bin/bcop
") [minInit doMakeInstall];
in

View file

@ -11,11 +11,11 @@ args : with args;
} ;
in with localDefs;
let
fixPkgconfig = FullDepEntry ("
fixPkgconfig = fullDepEntry ("
ensureDir \$out/lib
ln -fs \$out/share/pkgconfig \$out/lib/pkgconfig
") [minInit doMakeInstall defEnsureDir];
fixInterpreter = FullDepEntry ("
fixInterpreter = fullDepEntry ("
sed -e 's@^#!/bin/bash@#! ${stdenv.bash}/bin/bash@' -i \$out/bin/bcop
") [minInit doMakeInstall];
in

View file

@ -11,11 +11,11 @@ args : with args;
} ;
in with localDefs;
let
fixPkgconfig = FullDepEntry ("
fixPkgconfig = fullDepEntry ("
ensureDir \$out/lib
ln -fs \$out/share/pkgconfig \$out/lib/pkgconfig
") [minInit doMakeInstall defEnsureDir];
fixInterpreter = FullDepEntry ("
fixInterpreter = fullDepEntry ("
sed -e 's@^#!/bin/bash@#! ${stdenv.bash}/bin/bash@' -i \$out/bin/bcop
") [minInit doMakeInstall];
in

View file

@ -22,7 +22,7 @@ args : with args;
};
in with localDefs;
let
install = FullDepEntry ("
install = fullDepEntry ("
sed -e '/Checking for texture_from_pixmap:/areturn 0' -i compiz-manager
sed -e '/Checking for non power of two support: /areturn 0' -i compiz-manager
sed -e '/^\s*$/aPATH=\$PATH:${xvinfo}/bin:${xdpyinfo}/bin' -i compiz-manager

View file

@ -11,11 +11,11 @@ args : with args;
} null; /* null is a terminator for sumArgs */
in with localDefs;
let
sharePlugins = FullDepEntry ("
sharePlugins = fullDepEntry ("
ensureDir \$out/share/compiz-plugins
ln -vsf \$out/lib/compiz \$out/share/compiz-plugins
") [minInit doMakeInstall defEnsureDir];
fixIncludes = FullDepEntry ("
fixIncludes = fullDepEntry ("
sed -e 's@#include <text.h>@#include <compiz/text.h>@' -i src/group/group-internal.h;
sed -e 's@#include <text.h>@#include <compiz/text.h>@' -i src/scalefilter/scalefilter.c;
") [minInit doUnpack];

View file

@ -11,11 +11,11 @@ args : with args;
} ;
in with localDefs;
let
sharePlugins = FullDepEntry ("
sharePlugins = fullDepEntry ("
ensureDir \$out/share/compiz-plugins
ln -vsf \$out/lib/compiz \$out/share/compiz-plugins
") [minInit doMakeInstall defEnsureDir];
fixIncludes = FullDepEntry ("
fixIncludes = fullDepEntry ("
sed -e 's@#include <compiz-text.h>@#include <compiz/compiz-text.h>@' -i src/group/group-internal.h;
sed -e 's@#include <compiz-text.h>@#include <compiz/compiz-text.h>@' -i src/scalefilter/scalefilter.c;
sed -e 's@#include <compiz-mousepoll.h>@#include <compiz/compiz-mousepoll.h>@' -i src/showmouse/showmouse.c;

View file

@ -11,11 +11,11 @@ args : with args;
} ;
in with localDefs;
let
sharePlugins = FullDepEntry ("
sharePlugins = fullDepEntry ("
ensureDir \$out/share/compiz-plugins
ln -vsf \$out/lib/compiz \$out/share/compiz-plugins
") [minInit doMakeInstall defEnsureDir];
fixIncludes = FullDepEntry (''
fixIncludes = fullDepEntry (''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pluginsMain}/include/compiz"
'') [minInit doUnpack];
in

View file

@ -11,7 +11,7 @@ args : with args;
} null; /* null is a terminator for sumArgs */
in with localDefs;
let
sharePlugins = FullDepEntry ("
sharePlugins = fullDepEntry ("
ensureDir \$out/share/compiz-plugins
ln -vsf \$out/lib/compiz \$out/share/compiz-plugins
") [minInit doMakeInstall defEnsureDir];

View file

@ -11,7 +11,7 @@ args : with args;
} ;
in with localDefs;
let
sharePlugins = FullDepEntry ("
sharePlugins = fullDepEntry ("
ensureDir \$out/share/compiz-plugins
ln -vsf \$out/lib/compiz \$out/share/compiz-plugins
") [minInit doMakeInstall defEnsureDir];

View file

@ -11,7 +11,7 @@ args : with args;
} ;
in with localDefs;
let
sharePlugins = FullDepEntry ("
sharePlugins = fullDepEntry ("
ensureDir \$out/share/compiz-plugins
ln -vsf \$out/lib/compiz \$out/share/compiz-plugins
") [minInit doMakeInstall defEnsureDir];

View file

@ -24,7 +24,7 @@ args : with args;
};
in with localDefs;
let
postAll = FullDepEntry ("
postAll = fullDepEntry ("
for i in $out/bin/*; do
patchelf --set-rpath /var/run/opengl-driver/lib:$(patchelf --print-rpath $i) $i
done

View file

@ -25,7 +25,7 @@ args : with args;
};
in with localDefs;
let
postAll = FullDepEntry ("
postAll = fullDepEntry ("
for i in $out/bin/*; do
patchelf --set-rpath /var/run/opengl-driver/lib:$(patchelf --print-rpath $i) $i
done

View file

@ -24,7 +24,7 @@ args : with args;
};
in with localDefs;
let
postAll = FullDepEntry ("
postAll = fullDepEntry ("
for i in $out/bin/*; do
patchelf --set-rpath /var/run/opengl-driver/lib:$(patchelf --print-rpath $i) $i
done

View file

@ -3,7 +3,7 @@ let
lib = args.lib;
fetchurl = args.fetchurl;
noDepEntry = args.noDepEntry;
FullDepEntry = args.FullDepEntry;
fullDepEntry = args.fullDepEntry;
buildInputs = lib.attrVals ["clisp" "texinfo"] args;
version = lib.getAttr ["version"] "0.9.4.1" args;
@ -22,7 +22,7 @@ rec {
export HOME="$NIX_BUILD_TOP";
'');
installation = FullDepEntry (''
installation = fullDepEntry (''
ensureDir $out/bin
ensureDir $out/share/stumpwm/doc
ensureDir $out/share/info

View file

@ -34,7 +34,7 @@ args: with args; with stringsWithDeps; with lib;
else (abort "unknown archive type : ${s}"));
defAddToSearchPath = FullDepEntry ("
defAddToSearchPath = fullDepEntry ("
addToSearchPathWithCustomDelimiter() {
local delimiter=\$1
local varName=\$2
@ -85,7 +85,7 @@ args: with args; with stringsWithDeps; with lib;
trap \"closeNest\" EXIT
");
minInit = FullDepEntry ("
minInit = fullDepEntry ("
set -e
NIX_GCC=${stdenv.gcc}
export SHELL=${stdenv.shell}
@ -113,7 +113,7 @@ args: with args; with stringsWithDeps; with lib;
"
else "")) ["defNest" "defAddToSearchPath"];
addInputs = FullDepEntry ("
addInputs = fullDepEntry ("
# Recursively find all build inputs.
findInputs()
{
@ -179,7 +179,7 @@ args: with args; with stringsWithDeps; with lib;
PATH=\$_PATH\${_PATH:+\"\${PATH_DELIMITER}\"}\$PATH
") ["minInit"];
defEnsureDir = FullDepEntry ("
defEnsureDir = fullDepEntry ("
# Ensure that the given directories exists.
ensureDir() {
local dir
@ -189,7 +189,7 @@ args: with args; with stringsWithDeps; with lib;
}
") ["minInit"];
toSrcDir = s : FullDepEntry ((if (archiveType s) == "tar" then "
toSrcDir = s : fullDepEntry ((if (archiveType s) == "tar" then "
tar xvf '${s}'
cd \"\$(tar tf '${s}' | head -1 | sed -e 's@/.*@@' )\"
" else if (archiveType s) == "tgz" then "
@ -236,16 +236,16 @@ args: with args; with stringsWithDeps; with lib;
configureCommand = getAttr ["configureCommand"] "./configure" args;
doConfigure = FullDepEntry ("
doConfigure = fullDepEntry ("
${configureCommand} --prefix=\"\$prefix\" ${toString configureFlags}
") ["minInit" "addInputs" "doUnpack"];
doIntltool = FullDepEntry ("
doIntltool = fullDepEntry ("
mkdir -p config
intltoolize --copy --force
") ["minInit" "addInputs" "doUnpack"];
doAutotools = FullDepEntry ("
doAutotools = fullDepEntry ("
mkdir -p config
libtoolize --copy --force
aclocal --force
@ -255,17 +255,17 @@ args: with args; with stringsWithDeps; with lib;
autoconf
")["minInit" "addInputs" "doUnpack"];
doMake = FullDepEntry ("
doMake = fullDepEntry ("
make ${toString makeFlags}
") ["minInit" "addInputs" "doUnpack"];
doUnpack = toSrcDir (toString src);
installPythonPackage = FullDepEntry ("
installPythonPackage = fullDepEntry ("
python setup.py install --prefix=\"\$prefix\"
") ["minInit" "addInputs" "doUnpack"];
doPythonConfigure = FullDepEntry (''
doPythonConfigure = fullDepEntry (''
pythonVersion=$(toPythonPath "$prefix")
pythonVersion=''${pythonVersion#*/lib/python}
pythonVersion=''${pythonVersion%%/site-packages}
@ -275,11 +275,11 @@ args: with args; with stringsWithDeps; with lib;
python configure.py -b "$prefix/bin" -d "$(toPythonPath "$prefix")" -v "$prefix/share/sip" ${toString configureFlags}
'') ["minInit" "addInputs" "doUnpack"];
doMakeInstall = FullDepEntry ("
doMakeInstall = fullDepEntry ("
make ${toString (getAttr ["makeFlags"] "" args)} "+
"${toString (getAttr ["installFlags"] "" args)} install") ["doMake"];
doForceShare = FullDepEntry ("
doForceShare = fullDepEntry ("
ensureDir \"\$prefix/share\"
for d in ${toString forceShare}; do
if [ -d \"\$prefix/\$d\" -a ! -d \"\$prefix/share/\$d\" ]; then
@ -289,7 +289,7 @@ args: with args; with stringsWithDeps; with lib;
done;
") ["minInit" "defEnsureDir"];
doForceCopy = FullDepEntry (''
doForceCopy = fullDepEntry (''
name="$(basename $out)"
name="''${name#*-}"
ensureDir "$prefix/share/$name"
@ -306,7 +306,7 @@ args: with args; with stringsWithDeps; with lib;
toPatchCommand = s: "cat ${s} | patch ${toString patchFlags}";
doPatch = FullDepEntry (concatStringsSep ";"
doPatch = fullDepEntry (concatStringsSep ";"
(map toPatchCommand patches)
) ["minInit" "doUnpack"];
@ -326,9 +326,9 @@ args: with args; with stringsWithDeps; with lib;
(${envAdderList env}
echo '\"'\"${cmd}-orig\"'\"' '\"'\\\$@'\"' \n) > \"${cmd}\"";
doWrap = cmd: FullDepEntry (wrapEnv cmd (getAttr ["wrappedEnv"] [] args)) ["minInit"];
doWrap = cmd: fullDepEntry (wrapEnv cmd (getAttr ["wrappedEnv"] [] args)) ["minInit"];
makeManyWrappers = wildcard : wrapperFlags : FullDepEntry (''
makeManyWrappers = wildcard : wrapperFlags : fullDepEntry (''
for i in ${wildcard}; do
wrapProgram "$i" ${wrapperFlags}
done
@ -345,7 +345,7 @@ args: with args; with stringsWithDeps; with lib;
preservePathWrapperArguments = ''''${PATH:+ --prefix PATH : $PATH }'';
doPropagate = FullDepEntry ("
doPropagate = fullDepEntry ("
ensureDir \$out/nix-support
echo '${toString (getAttr ["propagatedBuildInputs"] [] args)}' >\$out/nix-support/propagated-build-inputs
") ["minInit" "defEnsureDir"];
@ -356,11 +356,11 @@ args: with args; with stringsWithDeps; with lib;
replaceScriptVar = file: name: value: "sed -e 's`^${name}=.*`${name}='\\''${value}'\\''`' -i ${file}";
replaceInScript = file: l: concatStringsSep "\n" ((pairMap (replaceScriptVar file) l));
replaceScripts = l: concatStringsSep "\n" (pairMap replaceInScript l);
doReplaceScripts = FullDepEntry (replaceScripts (getAttr ["shellReplacements"] [] args)) ["minInit"];
doReplaceScripts = fullDepEntry (replaceScripts (getAttr ["shellReplacements"] [] args)) ["minInit"];
makeNest = x: if x == defNest.text then x else "startNest\n" + x + "\nstopNest\n";
textClosure = a: steps: textClosureMap makeNest a (["defNest"] ++ steps);
inherit noDepEntry FullDepEntry PackEntry;
inherit noDepEntry fullDepEntry packEntry;
defList = getAttr ["defList"] [] args;
getVal = getValue args defList;
@ -393,11 +393,11 @@ args: with args; with stringsWithDeps; with lib;
surroundWithCommands = x : before : after : {deps=x.deps; text = before + "\n" +
x.text + "\n" + after ;};
createDirs = FullDepEntry (concatStringsSep ";"
createDirs = fullDepEntry (concatStringsSep ";"
(map (x: "ensureDir ${x}") (getAttr ["neededDirs"] [] args))
) ["minInit" "defEnsureDir"];
copyExtraDoc = FullDepEntry (''
copyExtraDoc = fullDepEntry (''
name="$(basename $out)"
name="''${name#*-}"
ensureDir "$out/share/doc/$name"
@ -425,7 +425,7 @@ args: with args; with stringsWithDeps; with lib;
a() { return 127; } ; a ;
";
doMakeCheck = FullDepEntry (''
doMakeCheck = fullDepEntry (''
make check
'') ["minInit"];
@ -453,7 +453,7 @@ args: with args; with stringsWithDeps; with lib;
(innerBuilderDefsPackage bd)
{};
generateFontsFromSFD = FullDepEntry (''
generateFontsFromSFD = fullDepEntry (''
for i in *.sfd; do
fontforge -c \
'Open($1);
@ -471,7 +471,7 @@ args: with args; with stringsWithDeps; with lib;
done
'') ["minInit" "addInputs" "doUnpack"];
installFonts = FullDepEntry (''
installFonts = fullDepEntry (''
ensureDir $out/share/fonts/truetype/public/${args.name}
ensureDir $out/share/fonts/opentype/public/${args.name}
ensureDir $out/share/fonts/type1/public/${args.name}
@ -485,12 +485,12 @@ args: with args; with stringsWithDeps; with lib;
cp *.map $out/share/texmf/fonts/map/${args.name} || echo No fontmap data
'') ["minInit" "defEnsureDir"];
simplyShare = shareName: FullDepEntry (''
simplyShare = shareName: fullDepEntry (''
ensureDir $out/share
cp -r . $out/share/${shareName}
'') ["doUnpack" "defEnsureDir"];
doPatchShebangs = dir: FullDepEntry (''
doPatchShebangs = dir: fullDepEntry (''
patchShebangFun() {
# Rewrite all script interpreter file names (`#! /path') under the
# specified directory tree to paths found in $PATH. E.g.,
@ -512,7 +512,7 @@ args: with args; with stringsWithDeps; with lib;
patchShebangFun;
'') ["minInit"];
createPythonInstallationTarget = FullDepEntry (''
createPythonInstallationTarget = fullDepEntry (''
ensureDir $(toPythonPath $out)
export PYTHONPATH=$PYTHONPATH''${PYTHONPATH:+:}$(toPythonPath $out)
'') ["minInit" "addInputs" "defEnsureDir"];

View file

@ -15,14 +15,14 @@ args : with args;
patch = null;
meta = {};
doInstall = if args ? Install then
(FullDepEntry
(fullDepEntry
args.Install
(["doMake"]
++ (lib.getAttr ["extraInstallDeps"] [] args))
)
else FullDepEntry "" ["doMakeInstall"];
else fullDepEntry "" ["doMakeInstall"];
debPatch = FullDepEntry ((if args ? patch then ''
debPatch = fullDepEntry ((if args ? patch then ''
gunzip < ${args.patch} | patch -Np1
'' else "")
+''

View file

@ -7,7 +7,7 @@ args : with args; with builderDefs;
};
buildInputs = [mkfontdir mkfontscale];
configureFlags = [];
doInstall = FullDepEntry (''
doInstall = fullDepEntry (''
tar xf ${src}
ensureDir $out/share/fonts/
cp *.bdf $out/share/fonts

View file

@ -6,7 +6,7 @@ args : with args;
};
in with localDefs;
let
doInstall = FullDepEntry ("
doInstall = fullDepEntry ("
ensureDir \$out/share/fonts/
cd \$out/share/fonts
for i in ${toString paths}; do

View file

@ -8,7 +8,7 @@ args : with args; with builderDefs;
buildInputs = [unzip];
configureFlags = [];
doInstall = FullDepEntry (''
doInstall = fullDepEntry (''
unzip ${src}
ensureDir $out/share/fonts/junicode-ttf
cp *.ttf $out/share/fonts/junicode-ttf

View file

@ -11,7 +11,7 @@ rec {
/* doConfigure should be specified separately */
phaseNames = ["doCopy"];
doCopy = FullDepEntry(''
doCopy = fullDepEntry(''
ensureDir $out/share/texmf/fonts/enc
ensureDir $out/share/texmf/fonts/map
ensureDir $out/share/texmf/fonts/type1/public/lm

View file

@ -11,7 +11,7 @@ rec {
/* doConfigure should be specified separately */
phaseNames = ["doCopy"];
doCopy = FullDepEntry(''
doCopy = fullDepEntry(''
ensureDir $out/share/texmf/
ensureDir $out/share/fonts/

View file

@ -8,7 +8,7 @@ args : with args; with builderDefs;
buildInputs = [];
configureFlags = [];
doInstall = FullDepEntry (''
doInstall = fullDepEntry (''
ensureDir $out/share/fonts
cp *.ttf $out/share/fonts
'') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];

View file

@ -19,7 +19,7 @@ rec {
/* doConfigure should be specified separately */
phaseNames = ["preBuild" "doMakeInstall" "postInstall"];
preBuild = FullDepEntry (''
preBuild = fullDepEntry (''
export NIX_LDFLAGS='-lXi -lX11 -lglib -lgtk -lgdk -lgdk_pixbuf -lc -lXext'
ensureDir $out/share
tar xf ${fpc.src} --strip-components=1 -C $out/share
@ -27,7 +27,7 @@ rec {
'')
["minInit" "defEnsureDir" "doUnpack"];
postInstall = FullDepEntry (''
postInstall = fullDepEntry (''
wrapProgram $out/bin/startlazarus --prefix NIX_LDFLAGS ' ' "'$NIX_LDFLAGS'"
'') ["doMakeInstall" "minInit" "defEnsureDir"];

View file

@ -14,7 +14,7 @@ rec {
patches = [ ./no-sys-dirs.patch ];
preConfigure = FullDepEntry (''
preConfigure = fullDepEntry (''
sed -e 's,^LLVMSRCDIR.*,LLVMSRCDIR := dummy,' \
-e 's,\$(LLVMSRCDIR)/include,${llvm}/include,g' \
@ -53,7 +53,7 @@ rec {
'') ["doUnpack" "minInit"];
configureCommand = "$(ls ../llvm-gcc*.*.source/configure)";
postInstall = FullDepEntry (''
postInstall = fullDepEntry (''
mv $out/bin/gcc $out/bin/llvm-gcc
mv $out/bin/g++ $out/bin/llvm-g++
'')["doMakeInstall" "minInit"];

View file

@ -13,7 +13,7 @@ let
shell=stdenv.shell;
in
let
allBuild = FullDepEntry ("
allBuild = fullDepEntry ("
(sleep 0.1; echo ) | clisp install.txt;
(sleep 0.1; echo -e '1\n(quit)\n' ) | sh Qi-Linux-CLisp
ensureDir \$out/share

View file

@ -2,7 +2,7 @@ args :
let
lib = args.lib;
fetchurl = args.fetchurl;
FullDepEntry = args.FullDepEntry;
fullDepEntry = args.fullDepEntry;
doPatchShebangs = args.doPatchShebangs;
version = lib.getAttr ["version"] "2008.03.30" args;
@ -29,7 +29,7 @@ rec {
phaseNames = ["preBuild" "doMakeInstall" "postInstall" (doPatchShebangs "$out/share/io/samples")
(doPatchShebangs "$out/lib/io")];
preBuild = FullDepEntry (''
preBuild = fullDepEntry (''
for i in $pkgs ${
if args.stdenv ? glibc then args.stdenv.glibc else ""
} ${
@ -41,7 +41,7 @@ rec {
done
'') ["minInit" "addInputs" "doUnpack"];
postInstall = FullDepEntry (''
postInstall = fullDepEntry (''
ensureDir $out/share/io
ln -s $out/lib/io/addons $out/share/io

View file

@ -15,7 +15,7 @@ rec {
/* doConfigure should be specified separately */
phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
preConfigure = FullDepEntry (''
preConfigure = fullDepEntry (''
sed -e 's@/usr/bin/uname@'"$(which uname)"'@g' -i configure
'') ["minInit" "addInputs" "doUnpack"];

View file

@ -9,7 +9,7 @@ rec {
buildInputs = [ruby makeWrapper];
configureFlags = [];
doInstall = FullDepEntry (''
doInstall = fullDepEntry (''
ruby setup.rb --prefix=$out/
wrapProgram $out/bin/gem --prefix RUBYLIB : $out/lib:$out/lib
'') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];

View file

@ -2,7 +2,7 @@ args :
let
lib = args.lib;
fetchurl = args.fetchurl;
FullDepEntry = args.FullDepEntry;
fullDepEntry = args.fullDepEntry;
version = lib.getAttr ["version"] "4.1.0" args;
buildInputs = with args; [
@ -22,11 +22,11 @@ rec {
/* doConfigure should be specified separately */
phaseNames = ["genMakefile" "doMakeInstall" "demoInstall"];
genMakefile = FullDepEntry ''
genMakefile = fullDepEntry ''
cmake -D CMAKE_INSTALL_PREFIX=$out .
'' ["minInit" "addInputs" "doUnpack"];
demoInstall = FullDepEntry(''
demoInstall = fullDepEntry(''
ensureDir $out/bin
cp chipmunk_demos $out/bin
'') ["doMakeInstall" "defEnsureDir"];

View file

@ -2,7 +2,7 @@ args :
let
lib = args.lib;
fetchurl = args.fetchurl;
FullDepEntry = args.FullDepEntry;
fullDepEntry = args.fullDepEntry;
version = lib.getAttr ["version"] "" args;
buildInputs = with args; [
@ -22,7 +22,7 @@ rec {
/* doConfigure should be specified separately */
phaseNames = ["doConfigure" "doMakeInstall" "postInstall"];
postInstall = FullDepEntry (''
postInstall = fullDepEntry (''
ln -s $out/include/opencv/* $out/include
'') ["doMakeInstall" "minInit"];

View file

@ -17,13 +17,13 @@ rec {
/* doConfigure should be specified separately */
phaseNames = ["doConfigure" (doPatchShebangs ".") "doReplaceUsrBin" "doMakeInstall" "doAddPrograms"];
doReplaceUsrBin = FullDepEntry (''
doReplaceUsrBin = fullDepEntry (''
for i in $(find . -name '*.pl') $(find . -name '*.pm'); do
sed -e 's@/usr/bin/gcc@gcc@' -i $i
done
'') ["minInit" "doUnpack"];
doAddPrograms = FullDepEntry (''
doAddPrograms = fullDepEntry (''
for i in Programs/.libs/*; do
cp $i $out/bin/webkit-program-$(basename $i)
done

View file

@ -21,7 +21,7 @@ rec {
/* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "doMakeInstall" "postInstall"];
postInstall = a.FullDepEntry (''
postInstall = a.fullDepEntry (''
ln -s $out/lib/python*/site-packages/gtk-2.0/* $out/lib/python*/site-packages/
'') ["minInit"];

View file

@ -18,7 +18,7 @@ rec {
/* doConfigure should be removed if not needed */
phaseNames = ["mkDirs" "installPythonPackage"];
mkDirs = a.FullDepEntry(''
mkDirs = a.fullDepEntry(''
ensureDir $out/bin $out/lib $out/share $(toPythonPath $out)
export PYTHONPATH=$PYTHONPATH:$(toPythonPath $out)
'') ["defEnsureDir" "addInputs"];

View file

@ -13,14 +13,14 @@ args : with args; let
goSrcDir = "
cd ltrace-*;
";
preBuild = FullDepEntry (''
preBuild = fullDepEntry (''
gunzip < ${patch} | patch -Np1
sed -e s@-Werror@@ -i Makefile.in
'')["minInit" "doUnpack"];
};
in with localDefs;
let
preConfigure = FullDepEntry ("
preConfigure = fullDepEntry ("
sed -e 's@-o root -g root@@' -i Makefile.in;
") [doUnpack minInit];
in

View file

@ -18,17 +18,17 @@ rec {
''--prefix PYTHONPATH : $(toPythonPath $out):$PYTHONPATH'')
];
prepareMainBuild = FullDepEntry (''
prepareMainBuild = fullDepEntry (''
cd src
export QTDIR=${qt}/
make -f Makefile.bootstrap makefile
'') ["minInit" "doUnpack"];
fixInc = FullDepEntry(''
fixInc = fullDepEntry(''
sed -e '1i\#include <stdlib.h>' -i resources.inline.h
'') ["minInit" "doUnpack"];
deploy = FullDepEntry (''
deploy = fullDepEntry (''
ensureDir $out/bin/
cp ../bin/xxdiff $out/bin
cd ..

View file

@ -10,7 +10,7 @@ args : with args;
++ (if args ? mesa then [args.mesa args.freeglut] else [])
;
configureFlags = [""];
preConfigure = builderDefs.stringsWithDeps.FullDepEntry (''
preConfigure = builderDefs.stringsWithDeps.fullDepEntry (''
sed -e 's/math[.]h/cmath/' -i vector.cxx
sed -e 's/games/bin/' -i Makefile.in
sed -e '1i\#include <stdlib.h>' -i construo_main.cxx -i command_line.cxx -i config.hxx

View file

@ -9,13 +9,13 @@ args: with args;
};
in with localDefs;
let
preBuild = FullDepEntry "
preBuild = fullDepEntry "
sed -e '
s@currentProbIndex != 100@0@;
' -i MainFrame.cpp;
" [minInit];
installPhase = FullDepEntry "
installPhase = fullDepEntry "
ensureDir \$out/bin \$out/libexec;
cp sand \$out/libexec;
echo -e '#! /bin/sh\nLC_ALL=C '\$out'/libexec/sand \"$@\"' >\$out/bin/fsg;

View file

@ -19,7 +19,7 @@ rec {
/* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "preBuild" "doMakeInstall"];
preBuild = a.FullDepEntry (''
preBuild = a.fullDepEntry (''
sed -i src/input.c -e 's/static pthread_t/pthread_t/'
sed -i "s@gnuchess@$out/bin/gnuchess@" -i src/gnuchessx
'') ["minInit" "doUnpack"];

View file

@ -19,7 +19,7 @@ rec {
/* doConfigure should be removed if not needed */
phaseNames = ["preBuild" "doMakeInstall" "postInstall"];
preBuild = a.FullDepEntry (''
preBuild = a.fullDepEntry (''
( cd sys/unix ; sh setup.sh )
sed -e 's@.*define HACKDIR.*@\#define HACKDIR "/tmp/nethack"@' -i include/config.h
sed -e '/define COMPRESS/d' -i include/config.h
@ -35,7 +35,7 @@ rec {
sed -re 's@^(CH...).*@\1 = true@' -i Makefile
'') ["minInit" "doUnpack"];
postInstall = a.FullDepEntry (''
postInstall = a.fullDepEntry (''
ensureDir $out/bin
ln -s $out/games/nethack $out/bin/nethack
sed -i $out/bin/nethack -e '5aNEWHACKDIR="$HOME/.nethack"'

View file

@ -13,7 +13,7 @@ args : with args; with builderDefs;
url = http://ftp.de.debian.org/debian/pool/main/s/space-orbit/space-orbit_1.01-9.diff.gz;
sha256 = "1v3s97day6fhv08l2rn81waiprhi1lfyjjsj55axfh6n6zqfn1w2";
};
customBuild = FullDepEntry (''
customBuild = fullDepEntry (''
gunzip < ${debianPatch} | patch -Np1
cd src
sed -e 's@/usr/share/games/orbit/@'$out'/dump/@g' -i *.c

View file

@ -19,7 +19,7 @@ rec {
/* doConfigure should be removed if not needed */
phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
preConfigure = a.FullDepEntry (''
preConfigure = a.fullDepEntry (''
sed -e '/TCL_LIB_LIST=/atcl8.4' -i configure
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DGLX_GLXEXT_LEGACY=1"
'') ["minInit" "doUnpack"];

View file

@ -20,7 +20,7 @@ rec {
/* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "preBuild" "doMakeInstall"];
preBuild = a.FullDepEntry(''
preBuild = a.fullDepEntry(''
sed -e '/FIRST_CHESS_PROGRAM/s@gnuchessx@${a.gnuchess}/bin/gnuchessx@' -i xboard.h
sed -e '/SECOND_CHESS_PROGRAM/s@gnuchessx@${a.gnuchess}/bin/gnuchessx@' -i xboard.h
'') ["doUnpack" "minInit"];

View file

@ -19,7 +19,7 @@ rec {
/* doConfigure should be removed if not needed */
phaseNames = ["preConfigure" "doConfigure" "preBuild" "doMakeInstall"];
preConfigure = a.FullDepEntry (''
preConfigure = a.fullDepEntry (''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.libXpm}/include/X11"
for i in $NIX_CFLAGS_COMPILE; do echo $i; ls ''${i#-I}; done
chmod a+rw config.h
@ -35,7 +35,7 @@ rec {
sed -e '/if [(]owner[)]/iowner=1;' -i main.c
'') ["minInit" "doUnpack"];
preBuild = a.FullDepEntry (''
preBuild = a.fullDepEntry (''
sed -e "s@/usr/local/@$out/@" -i Makefile
sed -e "s@ /bin/@ @" -i Makefile
ensureDir $out/bin $out/share $out/man/man1 $out/lib

View file

@ -16,7 +16,7 @@ rec {
inherit buildInputs;
configureFlags = [];
preConfigure = a.FullDepEntry (''
preConfigure = a.fullDepEntry (''
chmod a+rwX -R .
sed -re 's/ch(own|grp|mod)/true/' -i lib/*/makefile.zb makefile.in
sed -e '/FIXED_PATHS/d' -i src/z-config.h
@ -26,7 +26,7 @@ rec {
ensureDir $out/bin
'') ["minInit" "doUnpack" "addInputs" "defEnsureDir"];
postInstall = a.FullDepEntry (''
postInstall = a.fullDepEntry (''
mv $out/bin/zangband $out/bin/.zangband.real
echo '#! /bin/sh
PATH="$PATH:${a.coreutils}/bin"

View file

@ -6,7 +6,7 @@ Usage:
builder = writeScript "fsg-4.4-builder"
(textClosure [doUnpack addInputs preBuild doMake installPhase doForceShare]);
a step is defined by noDepEntry, FullDepEntry or PackEntry.
a step is defined by noDepEntry, fullDepEntry or packEntry.
To ensure that prerequisite are met those are added before the task itself by
textClosureDupList. Duplicated items are removed again.

View file

@ -5,7 +5,7 @@ rec {
buildInputs = lib.closePropagation paths;
doAggregate = FullDepEntry (''
doAggregate = fullDepEntry (''
for currentPath in ${lib.concatStringsSep " " buildInputs}; do
echo Symlinking "$currentPath"

View file

@ -9,7 +9,7 @@ rec {
buildInputs = [texLive];
propagatedBuildInputs = [texLiveLatexXColor texLivePGF];
phaseNames = ["doCopy"];
doCopy = FullDepEntry (''
doCopy = fullDepEntry (''
ensureDir $out/share/texmf-dist/tex/latex/beamer
cp -r * $out/share/texmf-dist/tex/latex/beamer
'') ["minInit" "doUnpack" "defEnsureDir" "addInputs"];

View file

@ -7,7 +7,7 @@ rec {
};
phaseNames = ["doCopy"];
doCopy = FullDepEntry (''
doCopy = fullDepEntry (''
ensureDir $out/share/texmf/fonts/enc
ensureDir $out/share/texmf/fonts/map
ensureDir $out/share/texmf/fonts/type1/public/cm-super

View file

@ -8,7 +8,7 @@ rec {
buildInputs = [texLive];
phaseNames = ["doCopy"];
doCopy = FullDepEntry (''
doCopy = fullDepEntry (''
ensureDir $out/share/texmf
cp -r * $out/share/texmf
'') ["minInit" "doUnpack" "defEnsureDir" "addInputs"];

View file

@ -17,7 +17,7 @@ rec {
setupHook = ./setup-hook.sh;
doPreConfigure = FullDepEntry (''
doPreConfigure = fullDepEntry (''
ensureDir $out
ensureDir $out/nix-support
cp ${setupHook} $out/nix-support/setup-hook.sh
@ -35,7 +35,7 @@ rec {
NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${icu}/include/layout";
'') ["minInit" "doUnpack" "addInputs" "defEnsureDir"];
doPostInstall = FullDepEntry(''
doPostInstall = fullDepEntry(''
mv $out/bin $out/libexec
ensureDir $out/bin
for i in $out/libexec/*/*; do

View file

@ -8,7 +8,7 @@ rec {
buildInputs = [texLive];
phaseNames = ["doCopy"];
doCopy = FullDepEntry (''
doCopy = fullDepEntry (''
ensureDir $out/share
cp -r texmf* $out/share/
'') ["minInit" "doUnpack" "defEnsureDir" "addInputs"];

View file

@ -11,7 +11,7 @@ rec {
propagatedBuildInputs = [texLiveLatexXColor texLive];
phaseNames = ["doCopy"];
doCopy = FullDepEntry (''
doCopy = fullDepEntry (''
ensureDir $out/share/texmf/tex/generic/pgf
cp -r * $out/share/texmf/tex/generic/pgf
'') ["minInit" "doUnpack" "defEnsureDir" "addInputs"];

View file

@ -8,7 +8,7 @@ rec {
buildInputs = [texLive];
phaseNames = ["doCopy"];
doCopy = FullDepEntry (''
doCopy = fullDepEntry (''
export HOME=$PWD
ensureDir $out/share/texmf/tex/latex/xcolor

View file

@ -18,11 +18,11 @@ args : with args;
} null; /* null is a terminator for sumArgs */
in with localDefs;
let
doPatch = FullDepEntry (if patchAR2425x86 !="" then ''
doPatch = fullDepEntry (if patchAR2425x86 !="" then ''
cd hal
patch -Np1 -i ${patchAR2425x86}
'' else "") [minInit doUnpack];
postInstall = FullDepEntry (''
postInstall = fullDepEntry (''
ln -s $out/usr/local/bin $out/bin
'') [minInit doMakeInstall];
in

View file

@ -12,7 +12,7 @@ args : with args;
};
in with localDefs;
let
postInstall = FullDepEntry (''
postInstall = fullDepEntry (''
ln -s $out/usr/local/bin $out/bin
'') [minInit doMakeInstall];
in

View file

@ -18,12 +18,12 @@ args : with args;
} null; /* null is a terminator for sumArgs */
in with localDefs;
let
doPatch = FullDepEntry (if patchAR2425x86 !="" then ''
doPatch = fullDepEntry (if patchAR2425x86 !="" then ''
cd hal
patch -Np1 -i ${patchAR2425x86}
cd ..
'' else "") [minInit doUnpack];
postInstall = FullDepEntry (''
postInstall = fullDepEntry (''
ln -s $out/usr/local/bin $out/bin
'') [minInit doMakeInstall];
in

View file

@ -12,7 +12,7 @@ args : with args;
} null; /* null is a terminator for sumArgs */
in with localDefs;
let
postInstall = FullDepEntry (''
postInstall = fullDepEntry (''
ln -s $out/usr/local/bin $out/bin
'') [minInit doMakeInstall];
in

View file

@ -12,7 +12,7 @@ args : with args;
} null; /* null is a terminator for sumArgs */
in with localDefs;
let
postInstall = FullDepEntry (''
postInstall = fullDepEntry (''
ln -s $out/usr/local/bin $out/bin
'') [minInit doMakeInstall];
in

View file

@ -15,13 +15,13 @@ args : with args;
};
in with localDefs;
let
preBuild = FullDepEntry (''
preBuild = fullDepEntry (''
echo Replacing HAL.
tar xvf ${hal20080528}
rm -r hal
mv ath_hal-* hal
'') ["minInit" "doUnpack"];
postInstall = FullDepEntry (''
postInstall = fullDepEntry (''
ln -s $out/usr/local/bin $out/bin
'') [minInit doMakeInstall];
in

View file

@ -16,13 +16,13 @@ args : with args;
};
in with localDefs;
let
preBuild = FullDepEntry (''
preBuild = fullDepEntry (''
echo Replacing HAL.
tar xvf ${hal20080528}
rm -r hal
mv ath_hal-* hal
'') ["minInit" "doUnpack"];
postInstall = FullDepEntry (''
postInstall = fullDepEntry (''
ln -s $out/usr/local/bin $out/bin
'') [minInit doMakeInstall];
in

View file

@ -16,13 +16,13 @@ args : with args;
};
in with localDefs;
let
preBuild = FullDepEntry (''
preBuild = fullDepEntry (''
echo Replacing HAL.
tar xvf ${hal20080528}
rm -r hal
mv ath_hal-* hal
'') ["minInit" "doUnpack"];
postInstall = FullDepEntry (''
postInstall = fullDepEntry (''
ln -s $out/usr/local/bin $out/bin
'') [minInit doMakeInstall];
in

View file

@ -13,7 +13,7 @@ rec {
"--with-system-map=${args.kernel}/System.map"
];
preConfigure = FullDepEntry (''
preConfigure = fullDepEntry (''
sed -e 's/FASTCALL//' -i configure configure.ac
sed -e 's/int (attach_pid/void (attach_pid/' -i configure configure.ac
'')["doUnpack" "minInit"];

View file

@ -16,7 +16,7 @@ rec {
inherit buildInputs;
configureFlags = [];
fixInc = a.FullDepEntry (''
fixInc = a.fullDepEntry (''
sed -e '/ifdef SYS_signalfd/atypedef long long loff_t;' -i src/fbterm.cpp
'') ["doUnpack" "minInit"];

View file

@ -17,7 +17,7 @@ rec {
goSrcDir = "cd tspc-advanced";
preBuild = FullDepEntry (''
preBuild = fullDepEntry (''
sed -e 's@/dev/net/tun@/dev/tun@' -i platform/linux/tsp_tun.c;
sed -e 's@/sbin/ifconfig@${nettools}/sbin/ifconfig@' -i template/linux.sh
sed -e 's@/sbin/route@${nettools}/sbin/route@' -i template/linux.sh

View file

@ -8,11 +8,11 @@ rec {
buildInputs = [boost];
configureFlags = [];
doFixBoost = FullDepEntry (''
doFixBoost = fullDepEntry (''
sed -e 's/-lboost_[a-z_]*/&-mt/g' -i src/Makefile.in
'') ["minInit" "doUnpack"];
doFixInc = FullDepEntry (''
doFixInc = fullDepEntry (''
sed -e '/[#]include [<]config.h[>]/a\#include <string.h>' -i src/unicode_to_utf8.cpp
cat src/unicode_to_utf8.cpp
'') ["minInit" "doUnpack"];

View file

@ -8,10 +8,10 @@ rec {
buildInputs = [];
configureFlags = [''--PREFIx=$out'' ''--kernel-path=$(ls -d ${kernel}/lib/modules/*/build)''];
debugStep = FullDepEntry (''
debugStep = fullDepEntry (''
cat config-host.mak
'') ["minInit"];
preConfigure = FullDepEntry (''
preConfigure = fullDepEntry (''
sed -e 's/`uname -r`/'"$(basename ${kernel}/lib/modules/*)"'/' -i install.sh
sed -e '/kernel_path=/akernel_path=$out$kernel_path' -i install.sh
sed -e '/depmod/d' -i install.sh

View file

@ -8,10 +8,10 @@ rec {
buildInputs = [];
configureFlags = [''--PREFIx=$out'' ''--kernel-path=$(ls -d ${kernel}/lib/modules/*/build)''];
debugStep = FullDepEntry (''
debugStep = fullDepEntry (''
cat config-host.mak
'') ["minInit"];
preConfigure = FullDepEntry (''
preConfigure = fullDepEntry (''
sed -e 's/`uname -r`/'"$(basename ${kernel}/lib/modules/*)"'/' -i install.sh
sed -e '/kernel_path=/akernel_path=$out$kernel_path' -i install.sh
sed -e '/depmod/d' -i install.sh

View file

@ -8,7 +8,7 @@ rec {
buildInputs = [libtool gettext e2fsprogs];
configureFlags = [];
preConfigure = FullDepEntry (''
preConfigure = fullDepEntry (''
sp_path=$(echo $PATH | sed -e 's/:/ /g');
sed -e 's@/usr/bin@'"$PATH: $sp_path"'@g' -i configure
sed -e 's@/usr/local/bin@'"$PATH: sp_path"'@g' -i configure

View file

@ -4,7 +4,7 @@ let makeDictdDB = _src: _name: _subdir: _locale:
with builderDefs;
let localDefs = builderDefs.passthru.function (rec {
src=_src;
doInstall = FullDepEntry (''
doInstall = fullDepEntry (''
ensureDir $out/share/dictd
tar xf ${src}
cp $(ls ./${_subdir}/*.{dict*,index} || true) $out/share/dictd

View file

@ -11,7 +11,7 @@ rec {
/* doConfigure should be specified separately */
phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
preConfigure = FullDepEntry (''
preConfigure = fullDepEntry (''
sed -e 's/[$](MKDIR)/mkdir -p /' -i doc/Makefile.in
'') ["addInputs" "doUnpack" "minInit"];

View file

@ -11,7 +11,7 @@ rec {
/* doConfigure should be specified separately */
phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
preConfigure = FullDepEntry (''
preConfigure = fullDepEntry (''
sed -e 's/[$](MKDIR)/mkdir -p /' -i doc/Makefile.in
sed -e 's/gpm2//' -i Makefile.in
'') ["addInputs" "doUnpack" "minInit"];

View file

@ -2,7 +2,7 @@ args :
let
lib = args.lib;
fetchurl = args.fetchurl;
FullDepEntry = args.FullDepEntry;
fullDepEntry = args.fullDepEntry;
version = lib.getAttr ["version"] "0.7.47" args;
buildInputs = with args; [
@ -25,7 +25,7 @@ rec {
"--with-http_secure_link_module"
];
preConfigure = FullDepEntry ''
preConfigure = fullDepEntry ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${args.libxml2}/include/libxml2"
'' [];

View file

@ -11,7 +11,7 @@ args : with args; with builderDefs;
buildInputs = [jre];
configureFlags = [];
installPhase = FullDepEntry (''
installPhase = fullDepEntry (''
sed -e 's@\(common_jvm_locations\)=.*@\1${jre}@' -i bin/openfire
cp -r . $out
rm -r $out/logs

View file

@ -18,7 +18,7 @@ rec {
/* doConfigure should be removed if not needed */
phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/irc.py" a.pythonWrapperArguments)];
deploy = a.FullDepEntry (''
deploy = a.fullDepEntry (''
ensureDir $out/bin $out/share/${name}
sed -e 's@/usr/bin/@${a.python}/bin/@' -i irc.py
sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.pyIRCt.xml"]' -i config.py

View file

@ -19,7 +19,7 @@ rec {
/* doConfigure should be removed if not needed */
phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/mail.py" a.pythonWrapperArguments)];
deploy = a.FullDepEntry (''
deploy = a.fullDepEntry (''
cd mail-transport
ensureDir $out/bin $out/share/${name}
sed -e 's@/usr/bin/@${a.python}/bin/@' -i mail.py

View file

@ -8,7 +8,7 @@ args : with args; with builderDefs.passthru.function {src="";};
};
buildInputs = [libX11 xproto xextproto libXext libXrandr randrproto];
doCreatePrefix = FullDepEntry (''
doCreatePrefix = fullDepEntry (''
ensureDir $out
'') ["defEnsureDir"];
configureFlags = [];

View file

@ -21,14 +21,14 @@ rec {
libc = if a.stdenv ? glibc then a.stdenv.glibc else "";
doCmake = a.FullDepEntry(''
doCmake = a.fullDepEntry(''
ensureDir $PWD/builddir
cd builddir
export NIX_LDFLAGS="$NIX_LDFLAGS -ldl -L$out/lib"
cmake .. -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=$out -DDL_LIB=${libc}/lib
'') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
postInstall = a.FullDepEntry(''
postInstall = a.fullDepEntry(''
patchelf --set-rpath $out/lib${if a.stdenv.gcc.gcc != null then ":${a.stdenv.gcc.gcc}/lib" else ""} $out/bin/cuneiform
'') ["minInit" "addInputs" "doMakeInstall"];

View file

@ -2,7 +2,7 @@ args :
let
lib = args.lib;
fetchurl = args.fetchurl;
FullDepEntry = args.FullDepEntry;
fullDepEntry = args.fullDepEntry;
version = lib.getAttr ["version"] "0.9.3" args;
buildInputs = with args; [
@ -22,15 +22,15 @@ rec {
phaseNames = ["preConfigure" "doConfigure" "doMake"
"createDirs" "doMakeInstall" "postInstall"];
preConfigure = FullDepEntry ''
preConfigure = fullDepEntry ''
cd src
sed -e /LDCONFIG/d -i libdecodeqr/Makefile.in
'' ["doUnpack"];
postInstall = FullDepEntry ''
postInstall = fullDepEntry ''
cp sample/simple/simpletest $out/bin/qrdecode
cd ..
'' ["doMake"];
createDirs = FullDepEntry ''
createDirs = fullDepEntry ''
ensureDir $out/bin $out/lib $out/include $out/share
'' ["defEnsureDir"];

View file

@ -8,7 +8,7 @@ rec {
buildInputs = [glib readline bison flex pkgconfig];
configureFlags = [];
preConfigure = FullDepEntry (''
preConfigure = fullDepEntry (''
sed -e 's@static \(GHashTable [*]mdb_backends;\)@\1@' -i src/libmdb/backend.c
'') ["doUnpack" "minInit"];

View file

@ -13,7 +13,7 @@ args : with args;
configureFlags = [];
} null; /* null is a terminator for sumArgs */
in with localDefs;
let build = FullDepEntry ("
let build = fullDepEntry ("
cd deps
sed -e 's/^CPP/#&/ ; s/^# CPP=gcc/CPP=gcc/' -i Makefile.camlidl
make

View file

@ -25,7 +25,7 @@ rec {
/* We want to run it as far as we can with our current permissions
For example, dependent builds would prefer to run --version
without ever using setuid pppd. We are not setuid anyway, so.. */
patchPrivileged = a.FullDepEntry(''
patchPrivileged = a.fullDepEntry(''
sed -e '/privileged =/aprivileged = 1;' -i pppd/main.c
sed -e '/SH DESCRIPTION/a WARNING: Patched version unsuitable to be setuid root' -i pppd/pppd.8
'') ["minInit" "doUnpack"];

View file

@ -26,12 +26,12 @@ rec {
export PPPD=${a.ppp}/sbin/pppd
'');
patchInstall = a.FullDepEntry(''
patchInstall = a.fullDepEntry(''
sed -i Makefile -e 's@DESTDIR)/etc/ppp@out)/share/${name}/etc/ppp@'
sed -i Makefile -e 's@PPPOESERVER_PPPD_OPTIONS=@&$(out)/share/${name}@'
'') ["minInit" "doUnpack"];
makeDirs = a.FullDepEntry(''
makeDirs = a.fullDepEntry(''
ensureDir $out/share/${name}/etc/ppp
'') ["minInit" "defEnsureDir"];

View file

@ -8,7 +8,7 @@ args : with args; with builderDefs;
buildInputs = [samba fuse];
configureFlags = [];
postInstall = FullDepEntry
postInstall = fullDepEntry
(''
ensureDir $out/lib
ln -fs ${samba}/lib/libsmbclient.so $out/lib/libsmbclient.so.0

View file

@ -2,7 +2,7 @@ args :
let
lib = args.lib;
fetchurl = args.fetchurl;
FullDepEntry = args.FullDepEntry;
fullDepEntry = args.fullDepEntry;
version = lib.getAttr ["version"] "" args;
buildInputs = with args; [
@ -21,7 +21,7 @@ rec {
/* doConfigure should be specified separately */
phaseNames = ["doMakeInstall"];
doUnpack = FullDepEntry (''
doUnpack = fullDepEntry (''
mkdir bmrsa
cd bmrsa
unzip ${src}

Some files were not shown because too many files have changed in this diff Show more