{twitter-color-emoji,noto-fonts-color-emoji}: Enable strictDeps
, Fix cross (#434587)
This commit is contained in:
commit
3e7fe80cc5
@ -3,6 +3,7 @@
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
buildPackages,
|
||||
python3Packages,
|
||||
pkg-config,
|
||||
cairo,
|
||||
imagemagick,
|
||||
@ -23,6 +24,8 @@ stdenvNoCC.mkDerivation rec {
|
||||
hash = "sha256-GYBnMpSUDNjAOZtbRPSmbW39TWP5ljEMukQRwq4J9U4=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
depsBuildBuild = [
|
||||
buildPackages.stdenv.cc
|
||||
pkg-config
|
||||
@ -35,7 +38,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
nototools
|
||||
pngquant
|
||||
which
|
||||
buildPackages.python3.pkgs.fonttools
|
||||
python3Packages.fonttools
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
@ -3,16 +3,8 @@
|
||||
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
cairo,
|
||||
imagemagick,
|
||||
nototools,
|
||||
pkg-config,
|
||||
pngquant,
|
||||
python3,
|
||||
which,
|
||||
zopfli,
|
||||
noto-fonts-color-emoji,
|
||||
}:
|
||||
|
||||
@ -27,7 +19,7 @@ let
|
||||
hash = "sha256-FLOqXDpSFyClBlG5u3IRL0EKeu1mckCfRizJh++IWxo=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "twitter-color-emoji";
|
||||
inherit version;
|
||||
|
||||
@ -43,16 +35,7 @@ stdenv.mkDerivation rec {
|
||||
mv ${twemojiSrc.name} ${noto-fonts-color-emoji.src.name}
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cairo
|
||||
python3.pkgs.fonttools
|
||||
imagemagick
|
||||
nototools
|
||||
pkg-config
|
||||
pngquant
|
||||
which
|
||||
zopfli
|
||||
];
|
||||
inherit (noto-fonts-color-emoji) strictDeps depsBuildBuild nativeBuildInputs;
|
||||
|
||||
postPatch =
|
||||
let
|
||||
|
Loading…
x
Reference in New Issue
Block a user