summary refs log tree commit diff
path: root/pkgs/data/fonts/junicode
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2008-08-19 05:54:09 +0000
committerMichael Raskin <7c6f434c@mail.ru>2008-08-19 05:54:09 +0000
commit87ff8d6347cd99618bc8f9ff58ddf357ce38c522 (patch)
tree304d18d1a67cf9e844bf9d772b2a5386d00aa5f0 /pkgs/data/fonts/junicode
parentb5b68ce414fabb63a782dd74e86e940350e9a662 (diff)
downloadnixpkgs-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/fonts/junicode')
-rw-r--r--pkgs/data/fonts/junicode/0.6.15.nix6
1 files changed, 3 insertions, 3 deletions
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;