Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d9642e006f88
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bae09a1c394f
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 30, 2019

  1. twitter-color-emoji: build with python3 

    This can now be marked as un-broken.
    @worldofpeace @FRidh
    worldofpeace authored and FRidh committed Oct 30, 2019
    Copy the full SHA
    4f8197b View commit details

  2. nixosTests.fontconfig-default-fonts: re-add twitter-color-emoji

    @worldofpeace @FRidh
    worldofpeace authored and FRidh committed Oct 30, 2019
    Copy the full SHA
    bae09a1 View commit details
Showing with 20 additions and 4 deletions.
  1. +1 −1 nixos/tests/fontconfig-default-fonts.nix
  2. +19 −3 pkgs/data/fonts/twitter-color-emoji/default.nix
2 changes: 1 addition & 1 deletion nixos/tests/fontconfig-default-fonts.nix
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ import ./make-test.nix ({ lib, ... }:
fonts.fonts = with pkgs; [
noto-fonts-emoji
cantarell-fonts
#twitter-color-emoji # Can't be generated with Python 3 version of nototools
twitter-color-emoji
source-code-pro
gentium
];
22 changes: 19 additions & 3 deletions pkgs/data/fonts/twitter-color-emoji/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,12 +4,13 @@
{ stdenv
, fetchFromGitHub
, cairo
, imagemagick
, graphicsmagick
, pkg-config
, pngquant
, python3
, which
, zopfli
, fetchpatch
}:

let
@@ -55,14 +56,30 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [
cairo
imagemagick
graphicsmagick
pkg-config
pngquant
python
which
zopfli
];

patches = [
# Port to python3
(fetchpatch {
url = "https://src.fedoraproject.org/rpms/twitter-twemoji-fonts/raw/3bc176c10ced2824fe03da5ff561e22a36bf8ccd/f/noto-emoji-port-to-python3.patch";
sha256 = "1b91abd050phxlxq7322i74nkx16fkhpw14yh97r2j4c7fqarr2q";
})
(fetchpatch {
url = "https://src.fedoraproject.org/rpms/twitter-twemoji-fonts/raw/3bc176c10ced2824fe03da5ff561e22a36bf8ccd/f/noto-emoji-python3.patch";
sha256 = "0mw2c748izb6h9a19jwc0qxlb6l1kj6k8gc345lpf7lfcxfl7l59";
})
(fetchpatch {
url = "https://src.fedoraproject.org/rpms/twitter-twemoji-fonts/raw/3bc176c10ced2824fe03da5ff561e22a36bf8ccd/f/noto-emoji-use-gm.patch";
sha256 = "0yfmfzaaiq5163c06172g4r734aysiqyv1s28siv642vqzsqh4i2";
})
];

postPatch = let
templateSubstitutions = stdenv.lib.concatStringsSep "; " [
''s#Noto Color Emoji#Twitter Color Emoji#''
@@ -118,6 +135,5 @@ stdenv.mkDerivation rec {
## Non-artwork is MIT
license = with licenses; [ asl20 ofl cc-by-40 mit ];
maintainers = with maintainers; [ jtojnar ];
broken = true; # Can't be build using the current Python 3 version of nototools
};
}