diff options
author | Michele Guerini Rocco <rnhmjoj@users.noreply.github.com> | 2020-02-14 21:48:48 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-14 21:48:48 +0100 |
commit | a11516c5b3c5e30edd499d71d963d2348059275c (patch) | |
tree | 182171627aa2fea45d5ef7831da24a253200f1b0 /pkgs/data | |
parent | dc62c393938efb15e76ad8e3d309ffd0ebe605dd (diff) | |
parent | b4c324c719beed529dce2c55b67afac3504ec834 (diff) | |
download | nixlib-a11516c5b3c5e30edd499d71d963d2348059275c.tar nixlib-a11516c5b3c5e30edd499d71d963d2348059275c.tar.gz nixlib-a11516c5b3c5e30edd499d71d963d2348059275c.tar.bz2 nixlib-a11516c5b3c5e30edd499d71d963d2348059275c.tar.lz nixlib-a11516c5b3c5e30edd499d71d963d2348059275c.tar.xz nixlib-a11516c5b3c5e30edd499d71d963d2348059275c.tar.zst nixlib-a11516c5b3c5e30edd499d71d963d2348059275c.zip |
Merge pull request #79855 from rnhmjoj/proggyfonts
proggyfonts: cleanup
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/fonts/proggyfonts/default.nix | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/pkgs/data/fonts/proggyfonts/default.nix b/pkgs/data/fonts/proggyfonts/default.nix index 580ea61a2df5..51165ceac13e 100644 --- a/pkgs/data/fonts/proggyfonts/default.nix +++ b/pkgs/data/fonts/proggyfonts/default.nix @@ -1,6 +1,4 @@ -{ stdenv, fetchurl, mkfontdir, mkfontscale }: - -# adapted from https://aur.archlinux.org/packages/proggyfonts/ +{ stdenv, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "proggyfonts-0.1"; @@ -10,31 +8,28 @@ stdenv.mkDerivation { sha256 = "1plcm1sjpa3hdqhhin48fq6zmz3ndm4md72916hd8ff0w6596q0n"; }; - nativeBuildInputs = [ mkfontdir mkfontscale ]; + nativeBuildInputs = [ mkfontscale ]; installPhase = '' - mkdir -p $out/share/doc/$name $out/share/fonts/misc $out/share/fonts/truetype - - cp Licence.txt $out/share/doc/$name/LICENSE - + # compress pcf fonts + mkdir -p $out/share/fonts/misc rm Speedy.pcf # duplicated as Speedy11.pcf for f in *.pcf; do - gzip -c "$f" > $out/share/fonts/misc/"$f".gz + gzip -n -9 -c "$f" > $out/share/fonts/misc/"$f".gz done - cp *.bdf $out/share/fonts/misc - cp *.ttf $out/share/fonts/truetype - for f in misc truetype; do - cd $out/share/fonts/$f - mkfontscale - mkfontdir - done + install -D -m 644 *.bdf -t "$out/share/fonts/misc" + install -D -m 644 *.ttf -t "$out/share/fonts/truetype" + install -D -m 644 Licence.txt -t "$out/share/doc/$name" + + mkfontscale "$out/share/fonts/truetype" + mkfontdir "$out/share/fonts/misc" ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "1l1sxmzp3gcd2d32nxar6xwd1v1w18a9gfh57zmsrfpspnfbz7y1"; + outputHash = "1x196rp3wqjd7m57bgp5kfy5jmj97qncxi1vwibs925ji7dqzfgf"; meta = with stdenv.lib; { homepage = http://upperbounds.net; |