From 371eef69fe2afce2175b8bd8a44e1daad99cefa2 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 18 Aug 2025 03:06:32 +0300 Subject: [PATCH] {twitter-color-emoji,noto-fonts-color-emoji}: Enable `strictDeps`, Fix cross twitter-color-emoji is already copying some attrs from noto-fonts-color-emoji so let's copy the deps too to fix cross. Cleanup the `buildPackages.python3.pkgs` by using `python3Packages` which is spliced. --- .../no/noto-fonts-color-emoji/package.nix | 5 +++- .../tw/twitter-color-emoji/package.nix | 23 +++---------------- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/no/noto-fonts-color-emoji/package.nix b/pkgs/by-name/no/noto-fonts-color-emoji/package.nix index ef2a82f0a959..e572ef3e060f 100644 --- a/pkgs/by-name/no/noto-fonts-color-emoji/package.nix +++ b/pkgs/by-name/no/noto-fonts-color-emoji/package.nix @@ -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 = '' diff --git a/pkgs/by-name/tw/twitter-color-emoji/package.nix b/pkgs/by-name/tw/twitter-color-emoji/package.nix index ae999224b791..6e49a942bf07 100644 --- a/pkgs/by-name/tw/twitter-color-emoji/package.nix +++ b/pkgs/by-name/tw/twitter-color-emoji/package.nix @@ -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