{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.

Artturin 371eef69 a21deff8

+7 -21
+4 -1
pkgs/by-name/no/noto-fonts-color-emoji/package.nix
··· 3 stdenvNoCC, 4 fetchFromGitHub, 5 buildPackages, 6 pkg-config, 7 cairo, 8 imagemagick, ··· 23 hash = "sha256-GYBnMpSUDNjAOZtbRPSmbW39TWP5ljEMukQRwq4J9U4="; 24 }; 25 26 depsBuildBuild = [ 27 buildPackages.stdenv.cc 28 pkg-config ··· 35 nototools 36 pngquant 37 which 38 - buildPackages.python3.pkgs.fonttools 39 ]; 40 41 postPatch = ''
··· 3 stdenvNoCC, 4 fetchFromGitHub, 5 buildPackages, 6 + python3Packages, 7 pkg-config, 8 cairo, 9 imagemagick, ··· 24 hash = "sha256-GYBnMpSUDNjAOZtbRPSmbW39TWP5ljEMukQRwq4J9U4="; 25 }; 26 27 + strictDeps = true; 28 + 29 depsBuildBuild = [ 30 buildPackages.stdenv.cc 31 pkg-config ··· 38 nototools 39 pngquant 40 which 41 + python3Packages.fonttools 42 ]; 43 44 postPatch = ''
+3 -20
pkgs/by-name/tw/twitter-color-emoji/package.nix
··· 3 4 { 5 lib, 6 - stdenv, 7 fetchFromGitHub, 8 - cairo, 9 - imagemagick, 10 - nototools, 11 - pkg-config, 12 - pngquant, 13 - python3, 14 - which, 15 - zopfli, 16 noto-fonts-color-emoji, 17 }: 18 ··· 27 hash = "sha256-FLOqXDpSFyClBlG5u3IRL0EKeu1mckCfRizJh++IWxo="; 28 }; 29 in 30 - stdenv.mkDerivation rec { 31 pname = "twitter-color-emoji"; 32 inherit version; 33 ··· 43 mv ${twemojiSrc.name} ${noto-fonts-color-emoji.src.name} 44 ''; 45 46 - nativeBuildInputs = [ 47 - cairo 48 - python3.pkgs.fonttools 49 - imagemagick 50 - nototools 51 - pkg-config 52 - pngquant 53 - which 54 - zopfli 55 - ]; 56 57 postPatch = 58 let
··· 3 4 { 5 lib, 6 + stdenvNoCC, 7 fetchFromGitHub, 8 noto-fonts-color-emoji, 9 }: 10 ··· 19 hash = "sha256-FLOqXDpSFyClBlG5u3IRL0EKeu1mckCfRizJh++IWxo="; 20 }; 21 in 22 + stdenvNoCC.mkDerivation rec { 23 pname = "twitter-color-emoji"; 24 inherit version; 25 ··· 35 mv ${twemojiSrc.name} ${noto-fonts-color-emoji.src.name} 36 ''; 37 38 + inherit (noto-fonts-color-emoji) strictDeps depsBuildBuild nativeBuildInputs; 39 40 postPatch = 41 let