diff options
| author | Nick Cao <nickcao@nichi.co> | 2022-01-18 20:38:32 +0800 |
|---|---|---|
| committer | sterni <sternenseemann@systemli.org> | 2022-03-12 14:38:39 +0100 |
| commit | 1037236e65cb903750a37d55a8eb668721bde866 (patch) | |
| tree | ff19f4484844004038a12a3193a84d04a79cc044 /pkgs/data | |
| parent | 9bac6d4bd953cd08c630b83c28c065ce335f2dcc (diff) | |
noto-fonts-emoji: fix cross compilation
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/fonts/noto-fonts/default.nix | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 9c9996db39e04..248d076b997a2 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -5,12 +5,12 @@ , fetchurl , cairo , nixosTests -, python3 , pkg-config , pngquant , which , imagemagick , zopfli +, buildPackages }: let @@ -130,8 +130,8 @@ in noto-fonts-emoji = let version = "2.034"; emojiPythonEnv = - python3.withPackages (p: with p; [ fonttools nototools ]); - in stdenv.mkDerivation { + buildPackages.python3.withPackages (p: with p; [ fonttools nototools ]); + in stdenvNoCC.mkDerivation { pname = "noto-fonts-emoji"; inherit version; @@ -142,13 +142,17 @@ in sha256 = "1d6zzk0ii43iqfnjbldwp8sasyx99lbjp1nfgqjla7ixld6yp98l"; }; - nativeBuildInputs = [ + depsBuildBuild = [ + buildPackages.stdenv.cc + pkg-config cairo + ]; + + nativeBuildInputs = [ imagemagick zopfli pngquant which - pkg-config emojiPythonEnv ]; @@ -159,14 +163,6 @@ 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 |