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/data | |
| 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/data')
| -rw-r--r-- | pkgs/data/fonts/clearlyU/1.9.nix | 6 | ||||
| -rw-r--r-- | pkgs/data/fonts/fontWrap/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/data/fonts/junicode/0.6.15.nix | 6 | ||||
| -rw-r--r-- | pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/data/fonts/clearlyU/1.9.nix b/pkgs/data/fonts/clearlyU/1.9.nix index 7dbae0e0840..e447dd3e065 100644 --- a/pkgs/data/fonts/clearlyU/1.9.nix +++ b/pkgs/data/fonts/clearlyU/1.9.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://crl.nmsu.edu/~mleisher/cu/cu12-1.9.tar.gz; @@ -15,7 +15,7 @@ args : with args; with builderDefs {src="";} null; mkfontdir mkfontscale '') ["minInit" "defEnsureDir" "addInputs"]; - }) null; /* null is a terminator for sumArgs */ + }); in with localDefs; stdenv.mkDerivation rec { name = "clearlyU-12-"+version; diff --git a/pkgs/data/fonts/fontWrap/default.nix b/pkgs/data/fonts/fontWrap/default.nix index 3e2dc1d2c34..875c65108ce 100644 --- a/pkgs/data/fonts/fontWrap/default.nix +++ b/pkgs/data/fonts/fontWrap/default.nix @@ -1,9 +1,9 @@ args : with args; - let localDefs = builderDefs { + let localDefs = builderDefs.meta.function { src =""; /* put a fetchurl here */ buildInputs = [mkfontdir mkfontscale ttmkfdir]; configureFlags = []; - } null; /* null is a terminator for sumArgs */ + }; in with localDefs; let doInstall = FullDepEntry (" diff --git a/pkgs/data/fonts/junicode/0.6.15.nix b/pkgs/data/fonts/junicode/0.6.15.nix index f199b0ca269..f6fcc1917b3 100644 --- a/pkgs/data/fonts/junicode/0.6.15.nix +++ b/pkgs/data/fonts/junicode/0.6.15.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/junicode/junicode-0.6.15.zip; @@ -13,7 +13,7 @@ args : with args; with builderDefs {src="";} null; ensureDir $out/share/fonts/junicode-ttf cp *.ttf $out/share/fonts/junicode-ttf '') ["minInit" "addInputs" "defEnsureDir"]; - }) null; /* null is a terminator for sumArgs */ + }); in with localDefs; stdenv.mkDerivation rec { name = "junicode-"+version; diff --git a/pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix b/pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix index c5aa6f40d40..15a7edd6535 100644 --- a/pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix +++ b/pkgs/data/fonts/wqy_zenhei/0.4.23-1.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/wqy/wqy-zenhei-0.4.23-1.tar.gz; @@ -12,7 +12,7 @@ args : with args; with builderDefs {src="";} null; ensureDir $out/share/fonts cp *.ttf $out/share/fonts '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"]; - }) null; /* null is a terminator for sumArgs */ + }); in with localDefs; stdenv.mkDerivation rec { name = "wqy-zenhei-"+version; |