Commit 5176fa7d authored by Robert Helgesson's avatar Robert Helgesson
Browse files

unifont: 15.0.04 -> 15.1.01 

Starting with this release, the TrueType fonts are no longer built by
default. Instead OpenType fonts are available and this commit
therefore switches to those.
parent 48b203ad

pkgs/data/fonts/unifont/default.nix

+7 −7
Original line number Diff line number Diff line
@@ -4,16 +4,16 @@ 


stdenv.mkDerivation rec {

  pname = "unifont";

  version = "15.0.04";

  version = "15.1.01";



  ttf = fetchurl {

    url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf";

    hash = "sha256-kkSbEvWBrvcnBgHDdKJjpSYF6BJDEwmYSxVQbPkQ6so=";

  otf = fetchurl {

    url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.otf";

    hash = "sha256-JJi4D5Zk/vkeaYjX4IIUaiCCp+e7Si3rL7+aNlqilww=";

  };



  pcf = fetchurl {

    url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz";

    hash = "sha256-rdzJuOkXYojgm5VfpshtJuCJYM0/iS+HnWMXEDsLQPg=";

    hash = "sha256-8ggUx6X1kwwd2qGl/XcqxkN35kaJbQYxoCMGIV0N6zU=";

  };



  nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ];
@@ -33,9 +33,9 @@ stdenv.mkDerivation rec { 
      install -m 644 -D unifont.otb "$out/share/fonts/unifont.otb"

      mkfontdir "$out/share/fonts"



      # install pcf and ttf fonts

      # install pcf and otf fonts

      install -m 644 -D ${pcf} $out/share/fonts/unifont.pcf.gz

      install -m 644 -D ${ttf} $out/share/fonts/truetype/unifont.ttf

      install -m 644 -D ${otf} $out/share/fonts/opentype/unifont.otf

      cd "$out/share/fonts"

      mkfontdir

      mkfontscale

pkgs/data/fonts/unifont_upper/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -2,11 +2,11 @@ 


stdenvNoCC.mkDerivation rec {

  pname = "unifont_upper";

  version = "15.0.04";

  version = "15.1.01";



  src = fetchurl {

    url = "mirror://gnu/unifont/unifont-${version}/${pname}-${version}.ttf";

    hash = "sha256-7iRcyKfGpv2rjVLPRNchxpXwj0KA5jlgDnCfG7byLLI=";

    url = "mirror://gnu/unifont/unifont-${version}/${pname}-${version}.otf";

    hash = "sha256-+aSVF8taBuAmkrQDvCH5bqdnEo21LwidMSYaiWjTrOg=";

  };



  dontUnpack = true;
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec { 
  installPhase = ''

    runHook preInstall



    install -Dm644 $src $out/share/fonts/truetype/unifont_upper.ttf

    install -Dm644 $src $out/share/fonts/opentype/unifont_upper.otf



    runHook postInstall

  '';