diff options
author | Davíð Steinn Geirsson <david@dsg.is> | 2021-07-26 18:37:28 +0000 |
---|---|---|
committer | Davíð Steinn Geirsson <david@dsg.is> | 2021-09-11 00:54:52 +0000 |
commit | 12d41756b076cc5dffc83ef36e4966b63606e47e (patch) | |
tree | 8e4bb9d2fc8e09e643bf8cc732ed1e23842a02fd /pkgs/data | |
parent | 9675a865c9c3eeec36c06361f7215e109925654c (diff) |
noto-fonts: Fix path to zopflipng, remove broken check
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/fonts/noto-fonts/default.nix | 8 |
1 files changed, 8 insertions, 0 deletions
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 |