Commit 371eef69 authored by Artturin's avatar Artturin
Browse files

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

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

+4 −1
Original line number Diff line number Diff line
@@ -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 = ''

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

+3 −20
Original line number Diff line number Diff line
@@ -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