From d4c42bfaf57cd54384425084d99400f80413edb3 Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Wed, 2 Sep 2020 19:02:46 +0200 Subject: [PATCH] liberation_ttf: Fix cross-compiling liberation_ttf runs python3 during build, hence it needs to be in nativeBuildInputs when cross-building. --- pkgs/data/fonts/liberation-fonts/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/liberation-fonts/default.nix b/pkgs/data/fonts/liberation-fonts/default.nix index 838a8d4c769b..edc39ff0a40e 100644 --- a/pkgs/data/fonts/liberation-fonts/default.nix +++ b/pkgs/data/fonts/liberation-fonts/default.nix @@ -2,6 +2,7 @@ let inherit (python3.pkgs) fonttools; + commonNativeBuildInputs = [ fontforge python3 ]; common = { version, repo, sha256, nativeBuildInputs, postPatch ? null }: stdenv.mkDerivation rec { @@ -50,13 +51,13 @@ in liberation_ttf_v1 = common { repo = "liberation-1.7-fonts"; version = "1.07.5"; - nativeBuildInputs = [ fontforge ]; + nativeBuildInputs = commonNativeBuildInputs ; sha256 = "1ffl10mf78hx598sy9qr5m6q2b8n3mpnsj73bwixnd4985gsz56v"; }; liberation_ttf_v2 = common { repo = "liberation-fonts"; version = "2.1.0"; - nativeBuildInputs = [ fontforge fonttools ]; + nativeBuildInputs = commonNativeBuildInputs ++ [ fonttools ]; postPatch = '' substituteInPlace scripts/setisFixedPitch-fonttools.py --replace \ 'font = ttLib.TTFont(fontfile)' \