summary refs log tree commit diff
path: root/pkgs/data/fonts
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2008-01-23 18:11:03 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2008-01-23 18:11:03 +0000
commitda57804fff1d34154fc4d13e0fa02cfc23dcfc32 (patch)
tree52b0094c02d297ab2c9280003286ab7b511c7bf1 /pkgs/data/fonts
parent4de89f61b00307debd0aebc36658a384e320bf30 (diff)
downloadnixlib-da57804fff1d34154fc4d13e0fa02cfc23dcfc32.tar
nixlib-da57804fff1d34154fc4d13e0fa02cfc23dcfc32.tar.gz
nixlib-da57804fff1d34154fc4d13e0fa02cfc23dcfc32.tar.bz2
nixlib-da57804fff1d34154fc4d13e0fa02cfc23dcfc32.tar.lz
nixlib-da57804fff1d34154fc4d13e0fa02cfc23dcfc32.tar.xz
nixlib-da57804fff1d34154fc4d13e0fa02cfc23dcfc32.tar.zst
nixlib-da57804fff1d34154fc4d13e0fa02cfc23dcfc32.zip
Merged with trunk again
svn path=/nixpkgs/branches/stdenv-updates/; revision=10267
Diffstat (limited to 'pkgs/data/fonts')
-rw-r--r--pkgs/data/fonts/fontWrap/default.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/data/fonts/fontWrap/default.nix b/pkgs/data/fonts/fontWrap/default.nix
index ef370be8e356..8bc120c686a9 100644
--- a/pkgs/data/fonts/fontWrap/default.nix
+++ b/pkgs/data/fonts/fontWrap/default.nix
@@ -1,9 +1,10 @@
 args : with args;
-	with builderDefs {
+	let localDefs = builderDefs {
 		src =""; /* put a fetchurl here */
 		buildInputs = [mkfontdir mkfontscale];
 		configureFlags = [];
 	} null; /* null is a terminator for sumArgs */
+	in with localDefs;
 let
 	doInstall = FullDepEntry ("
 		ensureDir \$out/share/fonts/
@@ -18,10 +19,10 @@ in
 stdenv.mkDerivation rec {
 	name = "wrapped-font-dir";
 	builder = writeScript (name + "-builder")
-		(textClosure [ doInstall doForceShare doPropagate]);
+		(textClosure localDefs [ doInstall doForceShare doPropagate]);
 	meta = {
 		description = "
-		Just a wrapper to create fots.dir and fonts.scale .
+		Just a wrapper to create fonts.dir and fonts.scale .
 ";
 	};
 }