public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #70687 from dtzWill/update/cherry-1.4

Browse Source 
cherry: 1.3 -> 1.4, pcf -> otb, mkfontdir for X11
This commit is contained in:
Will Dietz 2019-10-14 18:54:57 -05:00 committed by GitHub
commit 741b404e8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/data/fonts/cherry/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv, fetchFromGitHub, bdftopcf }: { stdenv, fetchFromGitHub, fonttosfnt, mkfontdir }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cherry"; pname = "cherry";
version = "1.3"; version = "1.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "turquoise-hexagon"; owner = "turquoise-hexagon";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1zaiqspf6y0hpszhihdsvsyw33d3ffdap4dym7w45wfrhdpvpi0p"; sha256 = "13zkxwp6r6kcxv4x459vwscr0n0sik4a3kcz5xnmlpvcdnbxi586";
}; };
nativeBuildInputs = [ bdftopcf ]; nativeBuildInputs = [ fonttosfnt mkfontdir ];
buildPhase = '' buildPhase = ''
patchShebangs make.sh patchShebangs make.sh
@ -20,7 +20,10 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
mkdir -p $out/share/fonts/misc 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; { meta = with stdenv.lib; {

2
pkgs/top-level/all-packages.nix
View File

@ -16820,7 +16820,7 @@ in
charis-sil = callPackage ../data/fonts/charis-sil { }; charis-sil = callPackage ../data/fonts/charis-sil { };
cherry = callPackage ../data/fonts/cherry { }; cherry = callPackage ../data/fonts/cherry { inherit (xorg) fonttosfnt mkfontdir; };
cnstrokeorder = callPackage ../data/fonts/cnstrokeorder {}; cnstrokeorder = callPackage ../data/fonts/cnstrokeorder {};