diff options
| -rw-r--r-- | pkgs/data/fonts/unifont/default.nix | 31 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 23 insertions, 11 deletions
diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index a80beee342b3..fc41263fee7e 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, mkfontscale, mkfontdir }: +{ stdenv, fetchurl, mkfontscale +, libfaketime, fonttosfnt +}: stdenv.mkDerivation rec { pname = "unifont"; @@ -14,23 +16,32 @@ stdenv.mkDerivation rec { sha256 = "1cd1fnk3m7giqp099kynnjj4m7q00lqm4ybqb1vzd2wi3j4a1awf"; }; - nativeBuildInputs = [ mkfontscale mkfontdir ]; + nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ]; - phases = "installPhase"; + phases = [ "buildPhase" "installPhase" ]; + + buildPhase = + '' + # convert pcf font to otb + faketime -f "1970-01-01 00:00:01" \ + fonttosfnt -g 2 -m 2 -v -o "unifont.otb" "${pcf}" + ''; installPhase = '' - mkdir -p $out/share/fonts $out/share/fonts/truetype - cp -v ${pcf} $out/share/fonts/unifont.pcf.gz - cp -v ${ttf} $out/share/fonts/truetype/unifont.ttf - cd $out/share/fonts + # install otb fonts + install -m 644 -D unifont.otb "$otb/share/fonts/unifont.otb" + mkfontdir "$otb/share/fonts" + + # install pcf and ttf fonts + install -m 644 -D ${pcf} $out/share/fonts/unifont.pcf.gz + install -m 644 -D ${ttf} $out/share/fonts/truetype/unifont.ttf + cd "$out/share/fonts" mkfontdir mkfontscale ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "0n3ms2k2mk7j6144l05c45smggwf3j5cwkaxhw93wf9hd1lhpwq1"; + outputs = [ "out" "otb" ]; meta = with stdenv.lib; { description = "Unicode font for Base Multilingual Plane"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 75e73f84581b..5fc4f12470e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18028,7 +18028,8 @@ in unihan-database = callPackage ../data/misc/unihan-database { }; - unifont = callPackage ../data/fonts/unifont { }; + unifont = callPackage ../data/fonts/unifont + { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; unifont_upper = callPackage ../data/fonts/unifont_upper { }; |