Skip to content

Commit 3e7fe80

Browse files
authored
{twitter-color-emoji,noto-fonts-color-emoji}: Enable strictDeps, Fix cross (NixOS#434587)
2 parents 794dd84 + 371eef6 commit 3e7fe80

File tree

2 files changed

+7
-21
lines changed

2 files changed

+7
-21
lines changed

pkgs/by-name/no/noto-fonts-color-emoji/package.nix

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
stdenvNoCC,
44
fetchFromGitHub,
55
buildPackages,
6+
python3Packages,
67
pkg-config,
78
cairo,
89
imagemagick,
@@ -23,6 +24,8 @@ stdenvNoCC.mkDerivation rec {
2324
hash = "sha256-GYBnMpSUDNjAOZtbRPSmbW39TWP5ljEMukQRwq4J9U4=";
2425
};
2526

27+
strictDeps = true;
28+
2629
depsBuildBuild = [
2730
buildPackages.stdenv.cc
2831
pkg-config
@@ -35,7 +38,7 @@ stdenvNoCC.mkDerivation rec {
3538
nototools
3639
pngquant
3740
which
38-
buildPackages.python3.pkgs.fonttools
41+
python3Packages.fonttools
3942
];
4043

4144
postPatch = ''

pkgs/by-name/tw/twitter-color-emoji/package.nix

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,8 @@
33

44
{
55
lib,
6-
stdenv,
6+
stdenvNoCC,
77
fetchFromGitHub,
8-
cairo,
9-
imagemagick,
10-
nototools,
11-
pkg-config,
12-
pngquant,
13-
python3,
14-
which,
15-
zopfli,
168
noto-fonts-color-emoji,
179
}:
1810

@@ -27,7 +19,7 @@ let
2719
hash = "sha256-FLOqXDpSFyClBlG5u3IRL0EKeu1mckCfRizJh++IWxo=";
2820
};
2921
in
30-
stdenv.mkDerivation rec {
22+
stdenvNoCC.mkDerivation rec {
3123
pname = "twitter-color-emoji";
3224
inherit version;
3325

@@ -43,16 +35,7 @@ stdenv.mkDerivation rec {
4335
mv ${twemojiSrc.name} ${noto-fonts-color-emoji.src.name}
4436
'';
4537

46-
nativeBuildInputs = [
47-
cairo
48-
python3.pkgs.fonttools
49-
imagemagick
50-
nototools
51-
pkg-config
52-
pngquant
53-
which
54-
zopfli
55-
];
38+
inherit (noto-fonts-color-emoji) strictDeps depsBuildBuild nativeBuildInputs;
5639

5740
postPatch =
5841
let

0 commit comments

Comments
 (0)