From 12d41756b076cc5dffc83ef36e4966b63606e47e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dav=C3=AD=C3=B0=20Steinn=20Geirsson?= Date: Mon, 26 Jul 2021 18:37:28 +0000 Subject: [PATCH] noto-fonts: Fix path to zopflipng, remove broken check --- pkgs/data/fonts/noto-fonts/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 07fba382286a..27e414b12e2a 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -141,6 +141,14 @@ in # python requirements using python.withPackages sed -i '/ifndef VIRTUAL_ENV/,+2d' Makefile + # Remove check for missing zopfli, it doesn't + # work and we guarantee its presence already. + sed -i '/ifdef MISSING_ZOPFLI/,+2d' Makefile + sed -i '/ifeq (,$(shell which $(ZOPFLIPNG)))/,+4d' Makefile + + sed -i '/ZOPFLIPNG = zopflipng/d' Makefile + echo "ZOPFLIPNG = ${zopfli}/bin/zopflipng" >> Makefile + # Make the build verbose so it won't get culled by Hydra thinking that # it somehow got stuck doing nothing. sed -i 's;\t@;\t;' Makefile