Cleanup ucs-fonts (#16994)

* ucs-fonts: remove use of `wrapFonts`

This cleans up the `ucs-fonts` package. In particular it removes the use
of `wrapFonts`, which depends on `builderDefs`. It also renames the
package attribute from `ucsFonts` to `ucs-fonts` (with the old name
being an alias for the newer).

* wrapFonts: remove

Removed since this attribute is no longer used and depends on
`builderDefs`.

4 files changed, 34 insertions, 64 deletions

diff --git a/pkgs/data/fonts/fontWrap/default.nix b/pkgs/data/fonts/fontWrap/default.nix
deleted file mode 100644
index e2822cf164f..00000000000
--- a/pkgs/data/fonts/fontWrap/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-args @ { fetchurl, stdenv, builderDefs, paths, mkfontdir, mkfontscale }:
-with args;
-  let localDefs = builderDefs.passthru.function {
-    src =""; /* put a fetchurl here */
-    buildInputs = [mkfontdir mkfontscale];
-    configureFlags = [];
-  };
-  in with localDefs;
-let
-  doInstall = fullDepEntry ("
-    mkdir -p \$out/share/fonts/
-    cd \$out/share/fonts
-    for i in ${toString paths}; do
-      find \$i -type f -exec ln -s '{}' . ';' ;
-    done
-    mkfontdir 
-    mkfontscale
-  ") [minInit addInputs defEnsureDir] ;
-in
-stdenv.mkDerivation rec {
-  name = "wrapped-font-dir";
-  builder = writeScript (name + "-builder")
-    (textClosure localDefs [ doInstall doForceShare doPropagate]);
-  preferLocalBuild = true;
-  meta = {
-    description = "
-    Just a wrapper to create fonts.dir and fonts.scale .
-";
-    inherit src;
-  };
-}
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;
   };
-})
+}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index d866d385762..dd458deb289 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -101,6 +101,7 @@ doNotDisplayTwice rec {
   system_config_printer = system-config-printer;  # added 2016-01-03
   telepathy_qt5 = qt5.telepathy;  # added 2015-12-19
   tftp_hpa = tftp-hpa; # added 2015-04-03
+  ucsFonts = ucs-fonts; # added 2016-07-15
   usb_modeswitch = usb-modeswitch; # added 2016-05-10
   vimbWrapper = vimb; # added 2015-01
   vimprobable2Wrapper = vimprobable2; # added 2015-01
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dcdbefb529d..11c15d81357 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11835,8 +11835,6 @@ in
 
   culmus = callPackage ../data/fonts/culmus { };
 
-  wrapFonts = paths : (callPackage ../data/fonts/fontWrap { inherit paths; });
-
   clearlyU = callPackage ../data/fonts/clearlyU { };
 
   cm_unicode = callPackage ../data/fonts/cm-unicode {};
@@ -12095,7 +12093,7 @@ in
 
   ubuntu_font_family = callPackage ../data/fonts/ubuntu-font-family { };
 
-  ucsFonts = callPackage ../data/fonts/ucs-fonts { };
+  ucs-fonts = callPackage ../data/fonts/ucs-fonts { };
 
   uni-vga = callPackage ../data/fonts/uni-vga { };