git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #137330 from dsg22/feature-noto-fonts-fix-zopflipng-detection

noto-fonts: Fix path to zopflipng, remove broken check

commitb90c20430b449dfaa686a2f3fbd97793d936f8b9 authorSandro <sandro.jaeckel@gmail.com> dateSat 11 Sep 2021, 14:16 (5 years ago) parent4ef9b3312d4175
1 file changed+8
pkgs/data/fonts/noto-fonts/default.nix+8
pkgs/data/fonts/noto-fonts/default.nix+8
@@ -141,6 +141,14 @@ in
141141 # python requirements using python.withPackages
142142 sed -i '/ifndef VIRTUAL_ENV/,+2d' Makefile
143143
144+ # Remove check for missing zopfli, it doesn't
145+ # work and we guarantee its presence already.
146+ sed -i '/ifdef MISSING_ZOPFLI/,+2d' Makefile
147+ sed -i '/ifeq (,$(shell which $(ZOPFLIPNG)))/,+4d' Makefile
148+
149+ sed -i '/ZOPFLIPNG = zopflipng/d' Makefile
150+ echo "ZOPFLIPNG = ${zopfli}/bin/zopflipng" >> Makefile
151+
144152 # Make the build verbose so it won't get culled by Hydra thinking that
145153 # it somehow got stuck doing nothing.
146154 sed -i 's;\t@;\t;' Makefile