diff options
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/dict/dictd-db.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/gpm/1.20.6.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/gpm/1.99.6.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/http/nginx/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/xmpp/openfire/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/xmpp/pyIRCt/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/xmpp/pyMAILt/default.nix | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/servers/dict/dictd-db.nix b/pkgs/servers/dict/dictd-db.nix index 6b981f0c4de..553b371d24c 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 6343234803d..6e9e6e64d51 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 bb797730a14..3874e4adfbd 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 ca144ff684b..cdf275b585f 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 5319e7ce231..dae058d3292 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 b8a7379070c..c6fed881e43 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 5a2c4c5484c..a4dcd5a4812 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 |