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

Merge pull request #137330 from dsg22/feature-noto-fonts-fix-zopflipng-detection

Browse Source 
noto-fonts: Fix path to zopflipng, remove broken check
This commit is contained in:
Sandro 2021-09-11 14:16:55 +02:00 committed by GitHub
commit b90c20430b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/data/fonts/noto-fonts/default.nix
View File

@ -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