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/servers/dict | |
| parent | b5b68ce414fabb63a782dd74e86e940350e9a662 (diff) | |
| download | nixpkgs-87ff8d6347cd99618bc8f9ff58ddf357ce38c522.tar nixpkgs-87ff8d6347cd99618bc8f9ff58ddf357ce38c522.tar.gz nixpkgs-87ff8d6347cd99618bc8f9ff58ddf357ce38c522.tar.bz2 nixpkgs-87ff8d6347cd99618bc8f9ff58ddf357ce38c522.tar.lz nixpkgs-87ff8d6347cd99618bc8f9ff58ddf357ce38c522.tar.xz nixpkgs-87ff8d6347cd99618bc8f9ff58ddf357ce38c522.tar.zst nixpkgs-87ff8d6347cd99618bc8f9ff58ddf357ce38c522.zip | |
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/servers/dict')
| -rw-r--r-- | pkgs/servers/dict/1.9.15.nix | 40 | ||||
| -rw-r--r-- | pkgs/servers/dict/dictd-db.nix | 8 |
2 files changed, 24 insertions, 24 deletions
diff --git a/pkgs/servers/dict/1.9.15.nix b/pkgs/servers/dict/1.9.15.nix index 4eb5c6cb0b3..e31a2769be6 100644 --- a/pkgs/servers/dict/1.9.15.nix +++ b/pkgs/servers/dict/1.9.15.nix @@ -1,24 +1,24 @@ -args : with args; with builderDefs {src="";} null; - let localDefs = builderDefs (rec { - src = /* put a fetchurl here */ - fetchurl { - url = ftp://ftp.dict.org/pub/dict/dictd-1.9.15.tar.gz; - sha256 = "0p41yf72l0igmshz6vxy3hm51z25600vrnb9j2jpgws4c03fqnac"; - }; +args : with args; with builderDefs; + let localDefs = builderDefs.meta.function ((rec { + src = /* put a fetchurl here */ + fetchurl { + url = ftp://ftp.dict.org/pub/dict/dictd-1.9.15.tar.gz; + sha256 = "0p41yf72l0igmshz6vxy3hm51z25600vrnb9j2jpgws4c03fqnac"; + }; - buildInputs = [flex bison which]; - configureFlags = [ " --datadir=/var/run/current-system/share/dictd " ]; - }) args null; /* null is a terminator for sumArgs */ - in with localDefs; + buildInputs = [flex bison which]; + configureFlags = [ " --datadir=/var/run/current-system/share/dictd " ]; + }) // args); + in with localDefs; stdenv.mkDerivation rec { - name = "dict-"+version; - builder = writeScript (name + "-builder") - (textClosure localDefs - [doConfigure doMakeInstall doForceShare doPropagate]); - meta = { - description = " - Dict protocol server and client. + name = "dict-"+version; + builder = writeScript (name + "-builder") + (textClosure localDefs + [doConfigure doMakeInstall doForceShare doPropagate]); + meta = { + description = " + Dict protocol server and client. "; - inherit src; - }; + inherit src; + }; } diff --git a/pkgs/servers/dict/dictd-db.nix b/pkgs/servers/dict/dictd-db.nix index 15503e44812..a7129b94d8e 100644 --- a/pkgs/servers/dict/dictd-db.nix +++ b/pkgs/servers/dict/dictd-db.nix @@ -1,8 +1,8 @@ { builderDefs }: let makeDictdDB = _src: _name: _subdir: _locale: -with builderDefs {src="";} null; - let localDefs = builderDefs (rec { +with builderDefs; + let localDefs = builderDefs.meta.function (rec { src=_src; doInstall = FullDepEntry ('' ensureDir $out/share/dictd @@ -13,7 +13,7 @@ with builderDefs {src="";} null; buildInputs = []; configureFlags = []; - }) null; /* null is a terminator for sumArgs */ + }); in with localDefs; stdenv.mkDerivation rec { name = "dictd-db-${_name}"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # Probably a bug in some FreeDict release files, but easier to trivially # work around than report. Not that it can cause any other problems.. makeDictdDBFreedict = _src: _name: _locale: makeDictdDB _src _name "{.,bin}" _locale; -fetchurl = (builderDefs {src="";} null).fetchurl; +fetchurl = builderDefs.fetchurl; in |