diff options
| author | Will Dietz <w@wdtz.org> | 2019-10-14 18:54:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-14 18:54:57 -0500 |
| commit | 741b404e8a021b99aebea0bff79efe3f34b83c45 (patch) | |
| tree | 01768c7c9e3b6953cee474a5d952dc5369267214 /pkgs/data/fonts | |
| parent | 886bca0af51f17adc9c77e005a5068e7a4dcae26 (diff) | |
| parent | 47b6dd43459034a8c42fe9580c1028420362cec0 (diff) | |
| download | nixpkgs-741b404e8a021b99aebea0bff79efe3f34b83c45.tar nixpkgs-741b404e8a021b99aebea0bff79efe3f34b83c45.tar.gz nixpkgs-741b404e8a021b99aebea0bff79efe3f34b83c45.tar.bz2 nixpkgs-741b404e8a021b99aebea0bff79efe3f34b83c45.tar.lz nixpkgs-741b404e8a021b99aebea0bff79efe3f34b83c45.tar.xz nixpkgs-741b404e8a021b99aebea0bff79efe3f34b83c45.tar.zst nixpkgs-741b404e8a021b99aebea0bff79efe3f34b83c45.zip | |
Merge pull request #70687 from dtzWill/update/cherry-1.4
cherry: 1.3 -> 1.4, pcf -> otb, mkfontdir for X11
Diffstat (limited to 'pkgs/data/fonts')
| -rw-r--r-- | pkgs/data/fonts/cherry/default.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/data/fonts/cherry/default.nix b/pkgs/data/fonts/cherry/default.nix index 6d1c4b10c91..00a8a2f61fc 100644 --- a/pkgs/data/fonts/cherry/default.nix +++ b/pkgs/data/fonts/cherry/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, bdftopcf }: +{ stdenv, fetchFromGitHub, fonttosfnt, mkfontdir }: stdenv.mkDerivation rec { pname = "cherry"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "turquoise-hexagon"; repo = pname; rev = version; - sha256 = "1zaiqspf6y0hpszhihdsvsyw33d3ffdap4dym7w45wfrhdpvpi0p"; + sha256 = "13zkxwp6r6kcxv4x459vwscr0n0sik4a3kcz5xnmlpvcdnbxi586"; }; - nativeBuildInputs = [ bdftopcf ]; + nativeBuildInputs = [ fonttosfnt mkfontdir ]; buildPhase = '' patchShebangs make.sh @@ -20,7 +20,10 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/share/fonts/misc - cp *.pcf $out/share/fonts/misc + cp *.otb $out/share/fonts/misc + + # create fonts.dir so NixOS xorg module adds to fp + mkfontdir $out/share/fonts/misc ''; meta = with stdenv.lib; { |