From 52647ea3b08e24623ef32b303a4815467e1144e3 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Tue, 19 May 2009 23:25:58 +0000 Subject: FullDepEntry -> fullDepEntry, PackEntry -> packEntry svn path=/nixpkgs/trunk/; revision=15662 --- pkgs/tools/X11/x2vnc/1.7.2.nix | 2 +- pkgs/tools/graphics/cuneiform/default.nix | 4 ++-- pkgs/tools/graphics/qrdecode/default.nix | 8 ++++---- pkgs/tools/misc/mdbtools/0.6-pre1.nix | 2 +- pkgs/tools/misc/relfs/cvs.2007.12.01.nix | 2 +- pkgs/tools/networking/ppp/default.nix | 2 +- pkgs/tools/networking/rp-pppoe/default.nix | 4 ++-- pkgs/tools/networking/smbfs-fuse/0.8.7.nix | 2 +- pkgs/tools/security/bmrsa/11.nix | 4 ++-- pkgs/tools/security/metasploit/3.1.nix | 2 +- pkgs/tools/security/ssss/0.5.nix | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) (limited to 'pkgs/tools') 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 -- cgit 1.4.1