1 files changed, 32 insertions, 30 deletions
diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/pkgs/data/fonts/ucs-fonts/default.nix
index bcba3957109..b9af7fad165 100644
--- a/pkgs/data/fonts/ucs-fonts/default.nix
+++ b/pkgs/data/fonts/ucs-fonts/default.nix
@@ -1,39 +1,41 @@
-{ stdenv, fetchurl, wrapFonts }:
+{ stdenv, fetchurl, mkfontdir, mkfontscale }:
 
-let
+stdenv.mkDerivation rec {
+  name = "ucs-fonts-${version}";
+  version = "20090406";
 
-  srcA = fetchurl {
-    url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts.tar.gz;
-    sha256 = "12hgizg25fzmk10wjl0c88x97h3pg5r9ga122s3y28wixz6x2bvh";
-  };
-  
-  srcB = fetchurl {
-    url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts-asian.tar.gz;
-    sha256 = "0ibjy4xpz5j373hsdr8bx99czfpclqmviwwv768j8n7z12z3wa51";
-  };
-  
-  srcC = fetchurl {
-    url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts-75dpi100dpi.tar.gz;
-    sha256 = "08vqr8yb636xa1s28vf3pm22dzkia0gisvsi2svqjqh4kk290pzh";
-  };  
+  srcs = [
+    (fetchurl {
+      url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts.tar.gz;
+      sha256 = "12hgizg25fzmk10wjl0c88x97h3pg5r9ga122s3y28wixz6x2bvh";
+    })
+    (fetchurl {
+      url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts-asian.tar.gz;
+      sha256 = "0ibjy4xpz5j373hsdr8bx99czfpclqmviwwv768j8n7z12z3wa51";
+    })
+    (fetchurl {
+      url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts-75dpi100dpi.tar.gz;
+      sha256 = "08vqr8yb636xa1s28vf3pm22dzkia0gisvsi2svqjqh4kk290pzh";
+    })
+  ];
+
+  sourceRoot = ".";
+
+  buildInputs = [ mkfontdir mkfontscale ];
 
-in
+  phases = [ "unpackPhase" "installPhase" ];
 
-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
+    mkdir -p $out/share/fonts
+    cp *.bdf $out/share/fonts
+    cd $out/share/fonts
+    mkfontdir
+    mkfontscale
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Unicode bitmap fonts";
-    maintainers = [stdenv.lib.maintainers.raskin];
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.all;
   };
-})
+}