diff options
102 files changed, 177 insertions, 177 deletions
diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/pkgs/applications/audio/ladspa-plugins/default.nix index 6a0dfe020d0a..17174fbebbf8 100644 --- a/pkgs/applications/audio/ladspa-plugins/default.nix +++ b/pkgs/applications/audio/ladspa-plugins/default.nix @@ -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]; diff --git a/pkgs/applications/audio/ladspa-plugins/ladspah.nix b/pkgs/applications/audio/ladspa-plugins/ladspah.nix index 1e29eadcadae..12ea91714a3b 100644 --- a/pkgs/applications/audio/ladspa-plugins/ladspah.nix +++ b/pkgs/applications/audio/ladspa-plugins/ladspah.nix @@ -12,7 +12,7 @@ in }; in with localDefs; let - copyFile = FullDepEntry (" + copyFile = fullDepEntry (" ensureDir \$out/include cp ${src} \$out/include/ladspa.h ") [minInit defEnsureDir]; diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index a8eb2de8e1a7..5cab85b993c7 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -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" diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix index 3ee0ba8db069..226dcb8d918e 100644 --- a/pkgs/applications/graphics/xaos/default.nix +++ b/pkgs/applications/graphics/xaos/default.nix @@ -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"]; diff --git a/pkgs/applications/graphics/xscreensaver/default.nix b/pkgs/applications/graphics/xscreensaver/default.nix index a422994ea312..fb09838d260b 100644 --- a/pkgs/applications/graphics/xscreensaver/default.nix +++ b/pkgs/applications/graphics/xscreensaver/default.nix @@ -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"]; diff --git a/pkgs/applications/misc/kiwixbuilder/default.nix b/pkgs/applications/misc/kiwixbuilder/default.nix index cf10ca58c4bc..cec8513e4c7d 100644 --- a/pkgs/applications/misc/kiwixbuilder/default.nix +++ b/pkgs/applications/misc/kiwixbuilder/default.nix @@ -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 diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix index 80a95e075357..ee8ff18bd5da 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix @@ -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"]; diff --git a/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix b/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix index a27c89afc6bd..b6d8c7feecb2 100644 --- a/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix +++ b/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix @@ -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"]; } diff --git a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix index db120924a9cb..848045d4a24d 100644 --- a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix +++ b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix @@ -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"]; } diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index d9f19a375a0d..b8263ff0b153 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -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 diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix index aebede6301f0..cc6901c0384d 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix @@ -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 diff --git a/pkgs/applications/networking/p2p/ldcpp/1.0.3.nix b/pkgs/applications/networking/p2p/ldcpp/1.0.3.nix index 96cdec1cef59..52491aa29fbe 100644 --- a/pkgs/applications/networking/p2p/ldcpp/1.0.3.nix +++ b/pkgs/applications/networking/p2p/ldcpp/1.0.3.nix @@ -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 diff --git a/pkgs/applications/science/geometry/drgeo/default.nix b/pkgs/applications/science/geometry/drgeo/default.nix index b254601a3d65..8f0bcd086545 100644 --- a/pkgs/applications/science/geometry/drgeo/default.nix +++ b/pkgs/applications/science/geometry/drgeo/default.nix @@ -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"]; diff --git a/pkgs/applications/version-management/viewmtn/0.10.nix b/pkgs/applications/version-management/viewmtn/0.10.nix index 82b841f964a7..08351ffa91dc 100644 --- a/pkgs/applications/version-management/viewmtn/0.10.nix +++ b/pkgs/applications/version-management/viewmtn/0.10.nix @@ -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 diff --git a/pkgs/applications/virtualization/qemu/linux-img/0.2.nix b/pkgs/applications/virtualization/qemu/linux-img/0.2.nix index 6c43a941b668..0d5e94ded959 100644 --- a/pkgs/applications/virtualization/qemu/linux-img/0.2.nix +++ b/pkgs/applications/virtualization/qemu/linux-img/0.2.nix @@ -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]; diff --git a/pkgs/applications/virtualization/xen/default.nix b/pkgs/applications/virtualization/xen/default.nix index 1bbdedcb4baa..b039412499df 100644 --- a/pkgs/applications/virtualization/xen/default.nix +++ b/pkgs/applications/virtualization/xen/default.nix @@ -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; diff --git a/pkgs/applications/window-managers/compiz-fusion/bcop/0.6.0.nix b/pkgs/applications/window-managers/compiz-fusion/bcop/0.6.0.nix index 7dd041941a61..9221d63a6fc0 100644 --- a/pkgs/applications/window-managers/compiz-fusion/bcop/0.6.0.nix +++ b/pkgs/applications/window-managers/compiz-fusion/bcop/0.6.0.nix @@ -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 diff --git a/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.4.nix b/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.4.nix index 9f516398b453..13928f3db732 100644 --- a/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.4.nix +++ b/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.4.nix @@ -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 diff --git a/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.8.nix index e9bede0a2877..07ba60cd8333 100644 --- a/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.8.nix +++ b/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.8.nix @@ -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 diff --git a/pkgs/applications/window-managers/compiz-fusion/compiz-manager/0.6.0.nix b/pkgs/applications/window-managers/compiz-fusion/compiz-manager/0.6.0.nix index c53b8586f1ce..934c21ba18b6 100644 --- a/pkgs/applications/window-managers/compiz-fusion/compiz-manager/0.6.0.nix +++ b/pkgs/applications/window-managers/compiz-fusion/compiz-manager/0.6.0.nix @@ -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 diff --git a/pkgs/applications/window-managers/compiz-fusion/extra/0.6.0.nix b/pkgs/applications/window-managers/compiz-fusion/extra/0.6.0.nix index bcd1ec9f0f26..9b091ac7ce42 100644 --- a/pkgs/applications/window-managers/compiz-fusion/extra/0.6.0.nix +++ b/pkgs/applications/window-managers/compiz-fusion/extra/0.6.0.nix @@ -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]; diff --git a/pkgs/applications/window-managers/compiz-fusion/extra/0.7.4.nix b/pkgs/applications/window-managers/compiz-fusion/extra/0.7.4.nix index efaec0c8731f..8262dd9ce7d8 100644 --- a/pkgs/applications/window-managers/compiz-fusion/extra/0.7.4.nix +++ b/pkgs/applications/window-managers/compiz-fusion/extra/0.7.4.nix @@ -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; diff --git a/pkgs/applications/window-managers/compiz-fusion/extra/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/extra/0.7.8.nix index 39108fab2042..7ea173e15611 100644 --- a/pkgs/applications/window-managers/compiz-fusion/extra/0.7.8.nix +++ b/pkgs/applications/window-managers/compiz-fusion/extra/0.7.8.nix @@ -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 diff --git a/pkgs/applications/window-managers/compiz-fusion/main/0.6.0.nix b/pkgs/applications/window-managers/compiz-fusion/main/0.6.0.nix index 6e69e9de6df0..255ca853e09d 100644 --- a/pkgs/applications/window-managers/compiz-fusion/main/0.6.0.nix +++ b/pkgs/applications/window-managers/compiz-fusion/main/0.6.0.nix @@ -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]; diff --git a/pkgs/applications/window-managers/compiz-fusion/main/0.7.4.nix b/pkgs/applications/window-managers/compiz-fusion/main/0.7.4.nix index a50a4e03c3fd..2294fdc776ab 100644 --- a/pkgs/applications/window-managers/compiz-fusion/main/0.7.4.nix +++ b/pkgs/applications/window-managers/compiz-fusion/main/0.7.4.nix @@ -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]; diff --git a/pkgs/applications/window-managers/compiz-fusion/main/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/main/0.7.8.nix index 5fae889fd3e3..fd4bb896c0ce 100644 --- a/pkgs/applications/window-managers/compiz-fusion/main/0.7.8.nix +++ b/pkgs/applications/window-managers/compiz-fusion/main/0.7.8.nix @@ -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]; diff --git a/pkgs/applications/window-managers/compiz/0.6.2.nix b/pkgs/applications/window-managers/compiz/0.6.2.nix index 0c89087d02a9..21edc7aaa51e 100644 --- a/pkgs/applications/window-managers/compiz/0.6.2.nix +++ b/pkgs/applications/window-managers/compiz/0.6.2.nix @@ -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 diff --git a/pkgs/applications/window-managers/compiz/0.7.8.nix b/pkgs/applications/window-managers/compiz/0.7.8.nix index 0e7cfc2910de..19daa93700b5 100644 --- a/pkgs/applications/window-managers/compiz/0.7.8.nix +++ b/pkgs/applications/window-managers/compiz/0.7.8.nix @@ -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 diff --git a/pkgs/applications/window-managers/compiz/0.8.0.nix b/pkgs/applications/window-managers/compiz/0.8.0.nix index d521b2a4fa3f..5ce13690991d 100644 --- a/pkgs/applications/window-managers/compiz/0.8.0.nix +++ b/pkgs/applications/window-managers/compiz/0.8.0.nix @@ -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 diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index ab123a035598..6bf0955354af 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -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 diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix index 11ad854c1e1c..b7d5130a44a2 100644 --- a/pkgs/build-support/builder-defs/builder-defs.nix +++ b/pkgs/build-support/builder-defs/builder-defs.nix @@ -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"]; diff --git a/pkgs/build-support/deb-package/default.nix b/pkgs/build-support/deb-package/default.nix index 4dc53ff0832f..6a1ca8490eef 100644 --- a/pkgs/build-support/deb-package/default.nix +++ b/pkgs/build-support/deb-package/default.nix @@ -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 "") +'' diff --git a/pkgs/data/fonts/clearlyU/1.9.nix b/pkgs/data/fonts/clearlyU/1.9.nix index 3ff5db2c60c6..6d2b9ffb812b 100644 --- a/pkgs/data/fonts/clearlyU/1.9.nix +++ b/pkgs/data/fonts/clearlyU/1.9.nix @@ -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 diff --git a/pkgs/data/fonts/fontWrap/default.nix b/pkgs/data/fonts/fontWrap/default.nix index 2c749ea609e0..fdf1a771842a 100644 --- a/pkgs/data/fonts/fontWrap/default.nix +++ b/pkgs/data/fonts/fontWrap/default.nix @@ -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 diff --git a/pkgs/data/fonts/junicode/0.6.15.nix b/pkgs/data/fonts/junicode/0.6.15.nix index b31b04c0f5bf..1a8497bebb73 100644 --- a/pkgs/data/fonts/junicode/0.6.15.nix +++ b/pkgs/data/fonts/junicode/0.6.15.nix @@ -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 diff --git a/pkgs/data/fonts/lmodern/0.92.nix b/pkgs/data/fonts/lmodern/0.92.nix index 0ac51a0303fe..556b9f998765 100644 --- a/pkgs/data/fonts/lmodern/0.92.nix +++ b/pkgs/data/fonts/lmodern/0.92.nix @@ -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 diff --git a/pkgs/data/fonts/lmodern/1.010.nix b/pkgs/data/fonts/lmodern/1.010.nix index 9c82b7028246..6948fa4cbbe5 100644 --- a/pkgs/data/fonts/lmodern/1.010.nix +++ b/pkgs/data/fonts/lmodern/1.010.nix @@ -11,7 +11,7 @@ rec { /* doConfigure should be specified separately */ phaseNames = ["doCopy"]; - doCopy = FullDepEntry('' + doCopy = fullDepEntry('' ensureDir $out/share/texmf/ ensureDir $out/share/fonts/ diff --git a/pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix b/pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix index 5d4866daf28e..edf9f8c40ffe 100644 --- a/pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix +++ b/pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix @@ -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"]; diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index 7186563eafc5..8846a82bc7bb 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -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"]; diff --git a/pkgs/development/compilers/llvm/llvm-gcc.nix b/pkgs/development/compilers/llvm/llvm-gcc.nix index 20090d4b1c6c..a1f5e031ebad 100644 --- a/pkgs/development/compilers/llvm/llvm-gcc.nix +++ b/pkgs/development/compilers/llvm/llvm-gcc.nix @@ -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"]; diff --git a/pkgs/development/compilers/qi/9.1.nix b/pkgs/development/compilers/qi/9.1.nix index a1c9670be84f..8b218d499c53 100644 --- a/pkgs/development/compilers/qi/9.1.nix +++ b/pkgs/development/compilers/qi/9.1.nix @@ -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 diff --git a/pkgs/development/interpreters/io/default.nix b/pkgs/development/interpreters/io/default.nix index c95e339d319f..953d47e6b91c 100644 --- a/pkgs/development/interpreters/io/default.nix +++ b/pkgs/development/interpreters/io/default.nix @@ -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 diff --git a/pkgs/development/interpreters/plt-scheme/default.nix b/pkgs/development/interpreters/plt-scheme/default.nix index e78a0fdbb9ec..94b596921602 100644 --- a/pkgs/development/interpreters/plt-scheme/default.nix +++ b/pkgs/development/interpreters/plt-scheme/default.nix @@ -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"]; diff --git a/pkgs/development/interpreters/ruby/gems.nix b/pkgs/development/interpreters/ruby/gems.nix index 9b24d582c185..d971ee22d65d 100644 --- a/pkgs/development/interpreters/ruby/gems.nix +++ b/pkgs/development/interpreters/ruby/gems.nix @@ -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"]; diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix index 84dff00a8b9c..c54877946aaf 100644 --- a/pkgs/development/libraries/chipmunk/default.nix +++ b/pkgs/development/libraries/chipmunk/default.nix @@ -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"]; diff --git a/pkgs/development/libraries/libcv/default.nix b/pkgs/development/libraries/libcv/default.nix index 649d0a5728f2..55e235e180bd 100644 --- a/pkgs/development/libraries/libcv/default.nix +++ b/pkgs/development/libraries/libcv/default.nix @@ -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"]; diff --git a/pkgs/development/libraries/webkit/default.nix b/pkgs/development/libraries/webkit/default.nix index df5eaafdf6dc..07412d89ab68 100644 --- a/pkgs/development/libraries/webkit/default.nix +++ b/pkgs/development/libraries/webkit/default.nix @@ -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 diff --git a/pkgs/development/python-modules/libsexy/default.nix b/pkgs/development/python-modules/libsexy/default.nix index e6bd1b9e5a17..b94d6d697972 100644 --- a/pkgs/development/python-modules/libsexy/default.nix +++ b/pkgs/development/python-modules/libsexy/default.nix @@ -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"]; diff --git a/pkgs/development/python-modules/xmpppy/default.nix b/pkgs/development/python-modules/xmpppy/default.nix index 9afa28011dee..e888161ded9b 100644 --- a/pkgs/development/python-modules/xmpppy/default.nix +++ b/pkgs/development/python-modules/xmpppy/default.nix @@ -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"]; diff --git a/pkgs/development/tools/misc/ltrace/0.5-3deb.nix b/pkgs/development/tools/misc/ltrace/0.5-3deb.nix index d462cc3ab392..d33f7ac566ce 100644 --- a/pkgs/development/tools/misc/ltrace/0.5-3deb.nix +++ b/pkgs/development/tools/misc/ltrace/0.5-3deb.nix @@ -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 diff --git a/pkgs/development/tools/misc/xxdiff/3.2.nix b/pkgs/development/tools/misc/xxdiff/3.2.nix index 92d071362f34..8100972d6eab 100644 --- a/pkgs/development/tools/misc/xxdiff/3.2.nix +++ b/pkgs/development/tools/misc/xxdiff/3.2.nix @@ -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 .. diff --git a/pkgs/games/construo/0.2.2.nix b/pkgs/games/construo/0.2.2.nix index 2080bb344ea4..578e233cbd75 100644 --- a/pkgs/games/construo/0.2.2.nix +++ b/pkgs/games/construo/0.2.2.nix @@ -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 diff --git a/pkgs/games/fsg/alt-builder.nix b/pkgs/games/fsg/alt-builder.nix index dfc7c6c724eb..c2b68a6c7462 100644 --- a/pkgs/games/fsg/alt-builder.nix +++ b/pkgs/games/fsg/alt-builder.nix @@ -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; diff --git a/pkgs/games/gnuchess/default.nix b/pkgs/games/gnuchess/default.nix index ff86ad268932..0e2f6d5d68ea 100644 --- a/pkgs/games/gnuchess/default.nix +++ b/pkgs/games/gnuchess/default.nix @@ -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"]; diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index 788dbaffbdec..da5a8c2c736d 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -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"' diff --git a/pkgs/games/orbit/1.01.nix b/pkgs/games/orbit/1.01.nix index 1d122643f658..a8cd48d99e6f 100644 --- a/pkgs/games/orbit/1.01.nix +++ b/pkgs/games/orbit/1.01.nix @@ -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 diff --git a/pkgs/games/tuxracer/default.nix b/pkgs/games/tuxracer/default.nix index 9194bcdb1d5a..8b236bf04550 100644 --- a/pkgs/games/tuxracer/default.nix +++ b/pkgs/games/tuxracer/default.nix @@ -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"]; diff --git a/pkgs/games/xboard/default.nix b/pkgs/games/xboard/default.nix index b4258c1c14b5..8571b1b1d4ee 100644 --- a/pkgs/games/xboard/default.nix +++ b/pkgs/games/xboard/default.nix @@ -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"]; diff --git a/pkgs/games/xsokoban/default.nix b/pkgs/games/xsokoban/default.nix index 733c7646a6ee..63dc0a271f98 100644 --- a/pkgs/games/xsokoban/default.nix +++ b/pkgs/games/xsokoban/default.nix @@ -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 diff --git a/pkgs/games/zangband/default.nix b/pkgs/games/zangband/default.nix index 410886f1930e..c339f4863004 100644 --- a/pkgs/games/zangband/default.nix +++ b/pkgs/games/zangband/default.nix @@ -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" diff --git a/pkgs/lib/strings-with-deps.nix b/pkgs/lib/strings-with-deps.nix index 98ce4871da82..e15b7fa8b8aa 100644 --- a/pkgs/lib/strings-with-deps.nix +++ b/pkgs/lib/strings-with-deps.nix @@ -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. diff --git a/pkgs/misc/tex/texlive/aggregate.nix b/pkgs/misc/tex/texlive/aggregate.nix index 5a6df800451f..0ece514c6fb8 100644 --- a/pkgs/misc/tex/texlive/aggregate.nix +++ b/pkgs/misc/tex/texlive/aggregate.nix @@ -5,7 +5,7 @@ rec { buildInputs = lib.closePropagation paths; - doAggregate = FullDepEntry ('' + doAggregate = fullDepEntry ('' for currentPath in ${lib.concatStringsSep " " buildInputs}; do echo Symlinking "$currentPath" diff --git a/pkgs/misc/tex/texlive/beamer.nix b/pkgs/misc/tex/texlive/beamer.nix index abeecffb5302..5f4ffd542118 100644 --- a/pkgs/misc/tex/texlive/beamer.nix +++ b/pkgs/misc/tex/texlive/beamer.nix @@ -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"]; diff --git a/pkgs/misc/tex/texlive/cm-super.nix b/pkgs/misc/tex/texlive/cm-super.nix index 19c8b5566b90..a147d6917430 100644 --- a/pkgs/misc/tex/texlive/cm-super.nix +++ b/pkgs/misc/tex/texlive/cm-super.nix @@ -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 diff --git a/pkgs/misc/tex/texlive/context.nix b/pkgs/misc/tex/texlive/context.nix index 11b4d15c0971..e917cecf41e2 100644 --- a/pkgs/misc/tex/texlive/context.nix +++ b/pkgs/misc/tex/texlive/context.nix @@ -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"]; diff --git a/pkgs/misc/tex/texlive/default.nix b/pkgs/misc/tex/texlive/default.nix index 477de2e946e5..38934facf45c 100644 --- a/pkgs/misc/tex/texlive/default.nix +++ b/pkgs/misc/tex/texlive/default.nix @@ -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 diff --git a/pkgs/misc/tex/texlive/extra.nix b/pkgs/misc/tex/texlive/extra.nix index 168b9706f2d0..7ad4d9ad3e00 100644 --- a/pkgs/misc/tex/texlive/extra.nix +++ b/pkgs/misc/tex/texlive/extra.nix @@ -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"]; diff --git a/pkgs/misc/tex/texlive/pgf.nix b/pkgs/misc/tex/texlive/pgf.nix index 01be99b95011..e23aa7f24dfe 100644 --- a/pkgs/misc/tex/texlive/pgf.nix +++ b/pkgs/misc/tex/texlive/pgf.nix @@ -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"]; diff --git a/pkgs/misc/tex/texlive/xcolor.nix b/pkgs/misc/tex/texlive/xcolor.nix index dcbbbcb8af6c..d6c8633dd320 100644 --- a/pkgs/misc/tex/texlive/xcolor.nix +++ b/pkgs/misc/tex/texlive/xcolor.nix @@ -8,7 +8,7 @@ rec { buildInputs = [texLive]; phaseNames = ["doCopy"]; - doCopy = FullDepEntry ('' + doCopy = fullDepEntry ('' export HOME=$PWD ensureDir $out/share/texmf/tex/latex/xcolor diff --git a/pkgs/os-specific/linux/atheros/0.9.3.3.nix b/pkgs/os-specific/linux/atheros/0.9.3.3.nix index f34ad16c9ce1..bfd130a76102 100644 --- a/pkgs/os-specific/linux/atheros/0.9.3.3.nix +++ b/pkgs/os-specific/linux/atheros/0.9.3.3.nix @@ -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 diff --git a/pkgs/os-specific/linux/atheros/0.9.4.nix b/pkgs/os-specific/linux/atheros/0.9.4.nix index b50041109927..c2d39072750d 100644 --- a/pkgs/os-specific/linux/atheros/0.9.4.nix +++ b/pkgs/os-specific/linux/atheros/0.9.4.nix @@ -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 diff --git a/pkgs/os-specific/linux/atheros/r2756.nix b/pkgs/os-specific/linux/atheros/r2756.nix index e26533738e34..41b06e70552c 100644 --- a/pkgs/os-specific/linux/atheros/r2756.nix +++ b/pkgs/os-specific/linux/atheros/r2756.nix @@ -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 diff --git a/pkgs/os-specific/linux/atheros/r3122.nix b/pkgs/os-specific/linux/atheros/r3122.nix index 020dce8a9a46..f40761770b88 100644 --- a/pkgs/os-specific/linux/atheros/r3122.nix +++ b/pkgs/os-specific/linux/atheros/r3122.nix @@ -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 diff --git a/pkgs/os-specific/linux/atheros/r3574.nix b/pkgs/os-specific/linux/atheros/r3574.nix index c16fc1285ec0..7b97a235ae7b 100644 --- a/pkgs/os-specific/linux/atheros/r3574.nix +++ b/pkgs/os-specific/linux/atheros/r3574.nix @@ -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 diff --git a/pkgs/os-specific/linux/atheros/r3693.nix b/pkgs/os-specific/linux/atheros/r3693.nix index bf8456787dd1..676298e59948 100644 --- a/pkgs/os-specific/linux/atheros/r3693.nix +++ b/pkgs/os-specific/linux/atheros/r3693.nix @@ -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 diff --git a/pkgs/os-specific/linux/atheros/r3837.nix b/pkgs/os-specific/linux/atheros/r3837.nix index d7dbe98893cb..3bc887e07176 100644 --- a/pkgs/os-specific/linux/atheros/r3837.nix +++ b/pkgs/os-specific/linux/atheros/r3837.nix @@ -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 diff --git a/pkgs/os-specific/linux/atheros/r3867.nix b/pkgs/os-specific/linux/atheros/r3867.nix index 62316d38b817..435981768957 100644 --- a/pkgs/os-specific/linux/atheros/r3867.nix +++ b/pkgs/os-specific/linux/atheros/r3867.nix @@ -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 diff --git a/pkgs/os-specific/linux/blcr/0.6.5.nix b/pkgs/os-specific/linux/blcr/0.6.5.nix index c16be4f9c700..236afccf79a2 100644 --- a/pkgs/os-specific/linux/blcr/0.6.5.nix +++ b/pkgs/os-specific/linux/blcr/0.6.5.nix @@ -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"]; diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/os-specific/linux/fbterm/default.nix index 24c8255a61f3..8ded70dd44b6 100644 --- a/pkgs/os-specific/linux/fbterm/default.nix +++ b/pkgs/os-specific/linux/fbterm/default.nix @@ -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"]; diff --git a/pkgs/os-specific/linux/gw6c/default.nix b/pkgs/os-specific/linux/gw6c/default.nix index a11037c0ebed..af8449f55db5 100644 --- a/pkgs/os-specific/linux/gw6c/default.nix +++ b/pkgs/os-specific/linux/gw6c/default.nix @@ -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 diff --git a/pkgs/os-specific/linux/jfsrec/svn-7.nix b/pkgs/os-specific/linux/jfsrec/svn-7.nix index 48ec07bbe8ad..4f47d710e755 100644 --- a/pkgs/os-specific/linux/jfsrec/svn-7.nix +++ b/pkgs/os-specific/linux/jfsrec/svn-7.nix @@ -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"]; diff --git a/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix b/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix index f3bfe1a5c7bb..d9dc076d92f3 100644 --- a/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix +++ b/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix @@ -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 diff --git a/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix b/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix index c2724a57bd6c..75bb1e72d486 100644 --- a/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix +++ b/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix @@ -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 diff --git a/pkgs/os-specific/linux/xfsprogs/2.9.7-1.nix b/pkgs/os-specific/linux/xfsprogs/2.9.7-1.nix index ccb4facc0789..a5c55bf98a7e 100644 --- a/pkgs/os-specific/linux/xfsprogs/2.9.7-1.nix +++ b/pkgs/os-specific/linux/xfsprogs/2.9.7-1.nix @@ -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 diff --git a/pkgs/servers/dict/dictd-db.nix b/pkgs/servers/dict/dictd-db.nix index 6b981f0c4de7..553b371d24c3 100644 --- a/pkgs/servers/dict/dictd-db.nix +++ b/pkgs/servers/dict/dictd-db.nix @@ -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 diff --git a/pkgs/servers/gpm/1.20.6.nix b/pkgs/servers/gpm/1.20.6.nix index 6343234803d8..6e9e6e64d518 100644 --- a/pkgs/servers/gpm/1.20.6.nix +++ b/pkgs/servers/gpm/1.20.6.nix @@ -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"]; diff --git a/pkgs/servers/gpm/1.99.6.nix b/pkgs/servers/gpm/1.99.6.nix index bb797730a149..3874e4adfbdc 100644 --- a/pkgs/servers/gpm/1.99.6.nix +++ b/pkgs/servers/gpm/1.99.6.nix @@ -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"]; diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index ca144ff684b3..cdf275b585fa 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -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" '' []; diff --git a/pkgs/servers/xmpp/openfire/default.nix b/pkgs/servers/xmpp/openfire/default.nix index 5319e7ce2317..dae058d32924 100644 --- a/pkgs/servers/xmpp/openfire/default.nix +++ b/pkgs/servers/xmpp/openfire/default.nix @@ -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 diff --git a/pkgs/servers/xmpp/pyIRCt/default.nix b/pkgs/servers/xmpp/pyIRCt/default.nix index b8a7379070cb..c6fed881e433 100644 --- a/pkgs/servers/xmpp/pyIRCt/default.nix +++ b/pkgs/servers/xmpp/pyIRCt/default.nix @@ -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 diff --git a/pkgs/servers/xmpp/pyMAILt/default.nix b/pkgs/servers/xmpp/pyMAILt/default.nix index 5a2c4c5484c8..a4dcd5a48127 100644 --- a/pkgs/servers/xmpp/pyMAILt/default.nix +++ b/pkgs/servers/xmpp/pyMAILt/default.nix @@ -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 diff --git a/pkgs/tools/X11/x2vnc/1.7.2.nix b/pkgs/tools/X11/x2vnc/1.7.2.nix index 0d805b44ac24..9c7e024551d3 100644 --- a/pkgs/tools/X11/x2vnc/1.7.2.nix +++ b/pkgs/tools/X11/x2vnc/1.7.2.nix @@ -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 = []; diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index 103178fbb396..dcad21290ef5 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -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"]; diff --git a/pkgs/tools/graphics/qrdecode/default.nix b/pkgs/tools/graphics/qrdecode/default.nix index bd850a509b4b..515bbb0fcda3 100644 --- a/pkgs/tools/graphics/qrdecode/default.nix +++ b/pkgs/tools/graphics/qrdecode/default.nix @@ -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"]; diff --git a/pkgs/tools/misc/mdbtools/0.6-pre1.nix b/pkgs/tools/misc/mdbtools/0.6-pre1.nix index 6217a3f77768..9478ef1286b9 100644 --- a/pkgs/tools/misc/mdbtools/0.6-pre1.nix +++ b/pkgs/tools/misc/mdbtools/0.6-pre1.nix @@ -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"]; diff --git a/pkgs/tools/misc/relfs/cvs.2007.12.01.nix b/pkgs/tools/misc/relfs/cvs.2007.12.01.nix index 0638331dbe21..22f9560946ac 100644 --- a/pkgs/tools/misc/relfs/cvs.2007.12.01.nix +++ b/pkgs/tools/misc/relfs/cvs.2007.12.01.nix @@ -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 diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix index 26580d052a1d..35e0ccb92fe1 100644 --- a/pkgs/tools/networking/ppp/default.nix +++ b/pkgs/tools/networking/ppp/default.nix @@ -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"]; diff --git a/pkgs/tools/networking/rp-pppoe/default.nix b/pkgs/tools/networking/rp-pppoe/default.nix index c0b51992ca8a..02439c230ff1 100644 --- a/pkgs/tools/networking/rp-pppoe/default.nix +++ b/pkgs/tools/networking/rp-pppoe/default.nix @@ -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"]; diff --git a/pkgs/tools/networking/smbfs-fuse/0.8.7.nix b/pkgs/tools/networking/smbfs-fuse/0.8.7.nix index be25331460a0..dbd6bfc2c8c8 100644 --- a/pkgs/tools/networking/smbfs-fuse/0.8.7.nix +++ b/pkgs/tools/networking/smbfs-fuse/0.8.7.nix @@ -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 diff --git a/pkgs/tools/security/bmrsa/11.nix b/pkgs/tools/security/bmrsa/11.nix index 7d6f04422f55..cb993d054c3e 100644 --- a/pkgs/tools/security/bmrsa/11.nix +++ b/pkgs/tools/security/bmrsa/11.nix @@ -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} diff --git a/pkgs/tools/security/metasploit/3.1.nix b/pkgs/tools/security/metasploit/3.1.nix index 815f0026e8e9..db4dcf3a8350 100644 --- a/pkgs/tools/security/metasploit/3.1.nix +++ b/pkgs/tools/security/metasploit/3.1.nix @@ -8,7 +8,7 @@ rec { buildInputs = [makeWrapper]; configureFlags = []; - doInstall = FullDepEntry('' + doInstall = fullDepEntry('' ensureDir $out/share/msf ensureDir $out/bin diff --git a/pkgs/tools/security/ssss/0.5.nix b/pkgs/tools/security/ssss/0.5.nix index a6e8429a9df0..9b460d0226c1 100644 --- a/pkgs/tools/security/ssss/0.5.nix +++ b/pkgs/tools/security/ssss/0.5.nix @@ -8,7 +8,7 @@ args : with args; with builderDefs; buildInputs = [gmp]; configureFlags = []; - doPatch = FullDepEntry ('' + doPatch = fullDepEntry ('' sed -e s@/usr/@$out/@g -i Makefile cp ssss.manpage.xml ssss.1 cp ssss.manpage.xml ssss.1.html |