Added UCS-fonts

svn path=/nixpkgs/trunk/; revision=10915

pkgs/data/fonts/fontWrap/default.nix

@@ -1,7 +1,7 @@
 args : with args;
 	let localDefs = builderDefs {
 		src =""; /* put a fetchurl here */
-		buildInputs = [mkfontdir mkfontscale];
+		buildInputs = [mkfontdir mkfontscale ttmkfdir];
 		configureFlags = [];
 	} null; /* null is a terminator for sumArgs */
 	in with localDefs;
@@ -14,6 +14,12 @@ let
 		done
 		mkfontdir 
 		mkfontscale
+		mv fonts.scale fonts.scale.old
+		mv fonts.dir fonts.dir.old
+		ttmkfdir
+		cat fonts.dir.old >> fonts.dir
+		cat fonts.scale.old >> fonts.scale
+		rm fonts.dir.old fonts.scale.old
 	") [minInit addInputs defEnsureDir] ;
 in
 stdenv.mkDerivation rec {

pkgs/data/fonts/ucs-fonts/default.nix

@@ -0,0 +1,40 @@
+args: with args;
+let
+
+srcA=
+	fetchurl {
+		url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts.tar.gz;
+		sha256 = "11vripxw9dgasbgcgs1z4hc1yjdypby2grj6y3c1a0c9w3v40kix";
+	};
+srcB=
+	fetchurl {
+		url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts-asian.tar.gz;
+		sha256 = "0fgka3vy8agbkp6xjq7igilbv88p8m9hh2qyikqhcm2qajdvzc4j";
+	};
+srcC=
+	fetchurl {
+		url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts-75dpi100dpi.tar.gz;
+		sha256 = "08vqr8yb636xa1s28vf3pm22dzkia0gisvsi2svqjqh4kk290pzh";
+	};	
+
+in
+wrapFonts (stdenv.mkDerivation {
+
+	name = "ucs-fonts";
+	phases = ["installPhase"];
+	installPhase = ''
+		tar xf ${srcA}
+		tar xf ${srcB}
+		tar xf ${srcC}
+		mkdir -p $out/share/fonts/ucs-fonts
+		cp *.bdf $out/share/fonts/ucs-fonts
+	'';
+
+	meta = {
+		description = "
+			UCS-fonts - Unicode bitmap fonts.
+		";
+		src = [srcA srcB srcC];
+	};
+})
+

pkgs/top-level/all-packages.nix

@@ -4411,7 +4411,7 @@ rec {
   };
 
   wrapFonts = paths : ((import ../data/fonts/fontWrap) {
-    inherit fetchurl stdenv builderDefs paths;
+    inherit fetchurl stdenv builderDefs paths ttmkfdir;
     inherit (xorg) mkfontdir mkfontscale;
   });
 
@@ -4490,6 +4490,10 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  ucsFonts = import ../data/fonts/ucs-fonts {
+    inherit fetchurl stdenv wrapFonts;
+  };
+
   unifontFun = import ../data/fonts/unifont {
     inherit debPackage perl;
     inherit (xorg) mkfontdir mkfontscale bdftopcf fontutil;