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`.

authored by Robert Helgesson and committed by Rok Garbas 715e01cf e9b9710e

+34 -64
-31
pkgs/data/fonts/fontWrap/default.nix
··· 1 - args @ { fetchurl, stdenv, builderDefs, paths, mkfontdir, mkfontscale }: 2 - with args; 3 - let localDefs = builderDefs.passthru.function { 4 - src =""; /* put a fetchurl here */ 5 - buildInputs = [mkfontdir mkfontscale]; 6 - configureFlags = []; 7 - }; 8 - in with localDefs; 9 - let 10 - doInstall = fullDepEntry (" 11 - mkdir -p \$out/share/fonts/ 12 - cd \$out/share/fonts 13 - for i in ${toString paths}; do 14 - find \$i -type f -exec ln -s '{}' . ';' ; 15 - done 16 - mkfontdir 17 - mkfontscale 18 - ") [minInit addInputs defEnsureDir] ; 19 - in 20 - stdenv.mkDerivation rec { 21 - name = "wrapped-font-dir"; 22 - builder = writeScript (name + "-builder") 23 - (textClosure localDefs [ doInstall doForceShare doPropagate]); 24 - preferLocalBuild = true; 25 - meta = { 26 - description = " 27 - Just a wrapper to create fonts.dir and fonts.scale . 28 - "; 29 - inherit src; 30 - }; 31 - }
+32 -30
pkgs/data/fonts/ucs-fonts/default.nix
··· 1 - { stdenv, fetchurl, wrapFonts }: 1 + { stdenv, fetchurl, mkfontdir, mkfontscale }: 2 2 3 - let 3 + stdenv.mkDerivation rec { 4 + name = "ucs-fonts-${version}"; 5 + version = "20090406"; 4 6 5 - srcA = fetchurl { 6 - url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts.tar.gz; 7 - sha256 = "12hgizg25fzmk10wjl0c88x97h3pg5r9ga122s3y28wixz6x2bvh"; 8 - }; 9 - 10 - srcB = fetchurl { 11 - url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts-asian.tar.gz; 12 - sha256 = "0ibjy4xpz5j373hsdr8bx99czfpclqmviwwv768j8n7z12z3wa51"; 13 - }; 14 - 15 - srcC = fetchurl { 16 - url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts-75dpi100dpi.tar.gz; 17 - sha256 = "08vqr8yb636xa1s28vf3pm22dzkia0gisvsi2svqjqh4kk290pzh"; 18 - }; 7 + srcs = [ 8 + (fetchurl { 9 + url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts.tar.gz; 10 + sha256 = "12hgizg25fzmk10wjl0c88x97h3pg5r9ga122s3y28wixz6x2bvh"; 11 + }) 12 + (fetchurl { 13 + url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts-asian.tar.gz; 14 + sha256 = "0ibjy4xpz5j373hsdr8bx99czfpclqmviwwv768j8n7z12z3wa51"; 15 + }) 16 + (fetchurl { 17 + url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts-75dpi100dpi.tar.gz; 18 + sha256 = "08vqr8yb636xa1s28vf3pm22dzkia0gisvsi2svqjqh4kk290pzh"; 19 + }) 20 + ]; 19 21 20 - in 22 + sourceRoot = "."; 21 23 22 - wrapFonts (stdenv.mkDerivation { 23 - name = "ucs-fonts"; 24 - 25 - phases = ["installPhase"]; 26 - 24 + buildInputs = [ mkfontdir mkfontscale ]; 25 + 26 + phases = [ "unpackPhase" "installPhase" ]; 27 + 27 28 installPhase = '' 28 - tar xf ${srcA} 29 - tar xf ${srcB} 30 - tar xf ${srcC} 31 - mkdir -p $out/share/fonts/ucs-fonts 32 - cp *.bdf $out/share/fonts/ucs-fonts 29 + mkdir -p $out/share/fonts 30 + cp *.bdf $out/share/fonts 31 + cd $out/share/fonts 32 + mkfontdir 33 + mkfontscale 33 34 ''; 34 35 35 - meta = { 36 + meta = with stdenv.lib; { 36 37 description = "Unicode bitmap fonts"; 37 - maintainers = [stdenv.lib.maintainers.raskin]; 38 + maintainers = [ maintainers.raskin ]; 39 + platforms = platforms.all; 38 40 }; 39 - }) 41 + }
+1
pkgs/top-level/aliases.nix
··· 101 101 system_config_printer = system-config-printer; # added 2016-01-03 102 102 telepathy_qt5 = qt5.telepathy; # added 2015-12-19 103 103 tftp_hpa = tftp-hpa; # added 2015-04-03 104 + ucsFonts = ucs-fonts; # added 2016-07-15 104 105 usb_modeswitch = usb-modeswitch; # added 2016-05-10 105 106 vimbWrapper = vimb; # added 2015-01 106 107 vimprobable2Wrapper = vimprobable2; # added 2015-01
+1 -3
pkgs/top-level/all-packages.nix
··· 11835 11835 11836 11836 culmus = callPackage ../data/fonts/culmus { }; 11837 11837 11838 - wrapFonts = paths : (callPackage ../data/fonts/fontWrap { inherit paths; }); 11839 - 11840 11838 clearlyU = callPackage ../data/fonts/clearlyU { }; 11841 11839 11842 11840 cm_unicode = callPackage ../data/fonts/cm-unicode {}; ··· 12095 12093 12096 12094 ubuntu_font_family = callPackage ../data/fonts/ubuntu-font-family { }; 12097 12095 12098 - ucsFonts = callPackage ../data/fonts/ucs-fonts { }; 12096 + ucs-fonts = callPackage ../data/fonts/ucs-fonts { }; 12099 12097 12100 12098 uni-vga = callPackage ../data/fonts/uni-vga { }; 12101 12099