diff options
Diffstat (limited to 'pkgs/applications')
30 files changed, 45 insertions, 45 deletions
diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/pkgs/applications/audio/ladspa-plugins/default.nix index 6a0dfe020d0..17174fbebbf 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 1e29eadcada..12ea91714a3 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 a8eb2de8e1a..5cab85b993c 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 3ee0ba8db06..226dcb8d918 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 a422994ea31..fb09838d260 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 cf10ca58c4b..cec8513e4c7 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 80a95e07535..ee8ff18bd5d 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 a27c89afc6b..b6d8c7feecb 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 db120924a9c..848045d4a24 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 d9f19a375a0..b8263ff0b15 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 aebede6301f..cc6901c0384 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 96cdec1cef5..52491aa29fb 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 b254601a3d6..8f0bcd08654 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 82b841f964a..08351ffa91d 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 6c43a941b66..0d5e94ded95 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 1bbdedcb4ba..b039412499d 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 7dd041941a6..9221d63a6fc 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 9f516398b45..13928f3db73 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 e9bede0a287..07ba60cd833 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 c53b8586f1c..934c21ba18b 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 bcd1ec9f0f2..9b091ac7ce4 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 efaec0c8731..8262dd9ce7d 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 39108fab204..7ea173e1561 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 6e69e9de6df..255ca853e09 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 a50a4e03c3f..2294fdc776a 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 5fae889fd3e..fd4bb896c0c 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 0c89087d02a..21edc7aaa51 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 0e7cfc2910d..19daa93700b 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 d521b2a4fa3..5ce13690991 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 ab123a03559..6bf0955354a 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 |