diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2008-08-19 05:54:09 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2008-08-19 05:54:09 +0000 |
| commit | 87ff8d6347cd99618bc8f9ff58ddf357ce38c522 (patch) | |
| tree | 304d18d1a67cf9e844bf9d772b2a5386d00aa5f0 /pkgs/tools/security | |
| parent | b5b68ce414fabb63a782dd74e86e940350e9a662 (diff) | |
Changed builderDefs to use composedArgsAndFun, reduced number of nulls, made overrides in builderDefsPackage to work in an intuitive manner.
svn path=/nixpkgs/trunk/; revision=12655
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/bmrsa/11.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/security/seccure/0.3.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/security/ssss/0.5.nix | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/tools/security/bmrsa/11.nix b/pkgs/tools/security/bmrsa/11.nix index dd1b8831bb79..9a5468e8cc5f 100644 --- a/pkgs/tools/security/bmrsa/11.nix +++ b/pkgs/tools/security/bmrsa/11.nix @@ -1,5 +1,5 @@ -args : with args; with builderDefs {src="";} null; - let localDefs = builderDefs (rec { +args : with args; with builderDefs; + let localDefs = builderDefs.meta.function (rec { src = /* put a fetchurl here */ fetchurl { url = http://prdownloads.sourceforge.net/sourceforge/bmrsa/bmrsa11.zip; @@ -16,7 +16,7 @@ args : with args; with builderDefs {src="";} null; ensureDir $out/bin echo -e 'install:\n\tcp bmrsa '$out'/bin' >> Makefile '') ["minInit" "addInputs" "defEnsureDir"]; - }) null; /* null is a terminator for sumArgs */ + }); in with localDefs; stdenv.mkDerivation rec { name = "bmrsa-"+version; diff --git a/pkgs/tools/security/seccure/0.3.nix b/pkgs/tools/security/seccure/0.3.nix index a42837cf60d9..36109524831c 100644 --- a/pkgs/tools/security/seccure/0.3.nix +++ b/pkgs/tools/security/seccure/0.3.nix @@ -1,5 +1,5 @@ -args : with args; with builderDefs {src="";} null; - let localDefs = builderDefs (rec { +args : with args; with builderDefs; + let localDefs = builderDefs.meta.function ((rec { src = /* put a fetchurl here */ fetchurl { url = http://freshmeat.net/redir/seccure/65485/url_tgz/seccure-0.3.tar.gz; @@ -12,7 +12,7 @@ args : with args; with builderDefs {src="";} null; sed -e s@/usr/@$out/@g -i Makefile ensureDir $out/bin $out/share/man/man1 '') ["minInit" "doUnpack" "defEnsureDir"]; - }) args null; /* null is a terminator for sumArgs */ + }) // args); in with localDefs; stdenv.mkDerivation rec { name = "seccure-"+version; diff --git a/pkgs/tools/security/ssss/0.5.nix b/pkgs/tools/security/ssss/0.5.nix index eedb788c777d..e35165be32b0 100644 --- a/pkgs/tools/security/ssss/0.5.nix +++ b/pkgs/tools/security/ssss/0.5.nix @@ -1,5 +1,5 @@ -args : with args; with builderDefs {src="";} null; - let localDefs = builderDefs (rec { +args : with args; with builderDefs; + let localDefs = builderDefs.meta.function (rec { src = /* put a fetchurl here */ fetchurl { url = http://point-at-infinity.org/ssss/ssss-0.5.tar.gz; @@ -15,7 +15,7 @@ args : with args; with builderDefs {src="";} null; ensureDir $out/bin $out/share/man/man1 echo -e 'install:\n\tcp ssss-combine ssss-split '"$out"'/bin' >>Makefile '') ["minInit" "doUnpack" "defEnsureDir"]; - }) null; /* null is a terminator for sumArgs */ + }); in with localDefs; stdenv.mkDerivation rec { name = "ssss-"+version; |