diff options
| author | rnhmjoj <rnhmjoj@inventati.org> | 2020-02-10 00:57:53 +0100 |
|---|---|---|
| committer | rnhmjoj <rnhmjoj@inventati.org> | 2020-02-10 00:57:53 +0100 |
| commit | 406b96fa7d02dff6abacb8c23b6c96fc1d33671f (patch) | |
| tree | f7bdefe439573cd5c93a78cc3e4011174107981d | |
| parent | f16019c58fe7948f947cdc4d73464d82fb69300d (diff) | |
| download | nixpkgs-406b96fa7d02dff6abacb8c23b6c96fc1d33671f.tar nixpkgs-406b96fa7d02dff6abacb8c23b6c96fc1d33671f.tar.gz nixpkgs-406b96fa7d02dff6abacb8c23b6c96fc1d33671f.tar.bz2 nixpkgs-406b96fa7d02dff6abacb8c23b6c96fc1d33671f.tar.lz nixpkgs-406b96fa7d02dff6abacb8c23b6c96fc1d33671f.tar.xz nixpkgs-406b96fa7d02dff6abacb8c23b6c96fc1d33671f.tar.zst nixpkgs-406b96fa7d02dff6abacb8c23b6c96fc1d33671f.zip | |
envypn-font: split outputs in out and otb
| -rw-r--r-- | pkgs/data/fonts/envypn-font/default.nix | 30 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 19 insertions, 14 deletions
diff --git a/pkgs/data/fonts/envypn-font/default.nix b/pkgs/data/fonts/envypn-font/default.nix index 351a0617ddc..bb5488481e5 100644 --- a/pkgs/data/fonts/envypn-font/default.nix +++ b/pkgs/data/fonts/envypn-font/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, mkfontdir, mkfontscale }: +{ stdenv, fetchurl, libfaketime +, fonttosfnt, mkfontscale +}: stdenv.mkDerivation { name = "envypn-font-1.7.1"; @@ -8,26 +10,28 @@ stdenv.mkDerivation { sha256 = "bda67b6bc6d5d871a4d46565d4126729dfb8a0de9611dae6c68132a7b7db1270"; }; - nativeBuildInputs = [ mkfontdir mkfontscale ]; + nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ]; unpackPhase = '' tar -xzf $src --strip-components=1 ''; + buildPhase = '' + # convert pcf fonts to otb + for i in *e.pcf.gz; do + faketime -f "1970-01-01 00:00:01" \ + fonttosfnt -v -o "$(basename "$i" .pcf.gz)".otb "$i" + done + ''; + installPhase = '' - # install the pcf fonts (for xorg applications) - fontDir="$out/share/fonts/envypn" - mkdir -p "$fontDir" - mv *.pcf.gz "$fontDir" - - cd "$fontDir" - mkfontdir - mkfontscale + install -D -m 644 -t "$out/share/fonts/misc" *.pcf.gz + install -D -m 644 -t "$otb/share/fonts/misc" *.otb + mkfontdir "$out/share/fonts/misc" + mkfontdir "$otb/share/fonts/misc" ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "04sjxfrlvjc2f0679cy4w366mpzbn3fp6gnrjb8vy12vjd1ffnc1"; + outputs = [ "out" "otb" ]; meta = with stdenv.lib; { description = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0c47548307..6add16ac09b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17464,7 +17464,8 @@ in encode-sans = callPackage ../data/fonts/encode-sans { }; - envypn-font = callPackage ../data/fonts/envypn-font { }; + envypn-font = callPackage ../data/fonts/envypn-font + { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; envdir = callPackage ../tools/misc/envdir-go { }; |