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

Merge pull request #96966 from kampka/liberation_ttf

Browse Source 
liberation_ttf: Fix cross-compiling
This commit is contained in:
Michael Raskin 2020-09-03 12:58:09 +00:00 committed by GitHub
commit ccde657295
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/data/fonts/liberation-fonts/default.nix
View File

@ -2,6 +2,7 @@
let let
inherit (python3.pkgs) fonttools; inherit (python3.pkgs) fonttools;
commonNativeBuildInputs = [ fontforge python3 ];
common = common =
{ version, repo, sha256, nativeBuildInputs, postPatch ? null }: { version, repo, sha256, nativeBuildInputs, postPatch ? null }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -50,13 +51,13 @@ in
liberation_ttf_v1 = common { liberation_ttf_v1 = common {
repo = "liberation-1.7-fonts"; repo = "liberation-1.7-fonts";
version = "1.07.5"; version = "1.07.5";
nativeBuildInputs = [ fontforge ]; nativeBuildInputs = commonNativeBuildInputs ;
sha256 = "1ffl10mf78hx598sy9qr5m6q2b8n3mpnsj73bwixnd4985gsz56v"; sha256 = "1ffl10mf78hx598sy9qr5m6q2b8n3mpnsj73bwixnd4985gsz56v";
}; };
liberation_ttf_v2 = common { liberation_ttf_v2 = common {
repo = "liberation-fonts"; repo = "liberation-fonts";
version = "2.1.0"; version = "2.1.0";
nativeBuildInputs = [ fontforge fonttools ]; nativeBuildInputs = commonNativeBuildInputs ++ [ fonttools ];
postPatch = '' postPatch = ''
substituteInPlace scripts/setisFixedPitch-fonttools.py --replace \ substituteInPlace scripts/setisFixedPitch-fonttools.py --replace \
'font = ttLib.TTFont(fontfile)' \ 'font = ttLib.TTFont(fontfile)' \