talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

{twitter-color-emoji,noto-fonts-color-emoji}: Enable strictDeps, Fix cross (#434587)

Browse Source
This commit is contained in:
Artturin 2025-08-19 04:08:06 +03:00 committed by GitHub
commit 3e7fe80cc5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,7 @@
stdenvNoCC, stdenvNoCC,
fetchFromGitHub, fetchFromGitHub,
buildPackages, buildPackages,
python3Packages,
pkg-config, pkg-config,
cairo, cairo,
imagemagick, imagemagick,
@ -23,6 +24,8 @@ stdenvNoCC.mkDerivation rec {
hash = "sha256-GYBnMpSUDNjAOZtbRPSmbW39TWP5ljEMukQRwq4J9U4="; hash = "sha256-GYBnMpSUDNjAOZtbRPSmbW39TWP5ljEMukQRwq4J9U4=";
}; };
strictDeps = true;
depsBuildBuild = [ depsBuildBuild = [
buildPackages.stdenv.cc buildPackages.stdenv.cc
pkg-config pkg-config
@ -35,7 +38,7 @@ stdenvNoCC.mkDerivation rec {
nototools nototools
pngquant pngquant
which which
buildPackages.python3.pkgs.fonttools python3Packages.fonttools
]; ];
postPatch = '' postPatch = ''

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

@ -3,16 +3,8 @@
{ {
lib, lib,
stdenv, stdenvNoCC,
fetchFromGitHub, fetchFromGitHub,
cairo,
imagemagick,
nototools,
pkg-config,
pngquant,
python3,
which,
zopfli,
noto-fonts-color-emoji, noto-fonts-color-emoji,
}: }:
@ -27,7 +19,7 @@ let
hash = "sha256-FLOqXDpSFyClBlG5u3IRL0EKeu1mckCfRizJh++IWxo="; hash = "sha256-FLOqXDpSFyClBlG5u3IRL0EKeu1mckCfRizJh++IWxo=";
}; };
in in
stdenv.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "twitter-color-emoji"; pname = "twitter-color-emoji";
inherit version; inherit version;
@ -43,16 +35,7 @@ stdenv.mkDerivation rec {
mv ${twemojiSrc.name} ${noto-fonts-color-emoji.src.name} mv ${twemojiSrc.name} ${noto-fonts-color-emoji.src.name}
''; '';
nativeBuildInputs = [ inherit (noto-fonts-color-emoji) strictDeps depsBuildBuild nativeBuildInputs;
cairo
python3.pkgs.fonttools
imagemagick
nototools
pkg-config
pngquant
which
zopfli
];
postPatch = postPatch =
let let