summary refs log tree commit diff
path: root/pkgs/data/fonts
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-10-29 17:12:10 -0400
committerFrederik Rietdijk <freddyrietdijk@fridh.nl>2019-10-30 15:03:26 +0100
commit4f8197bcc04de9bd5aa4da5114d0246fa4cbd03e (patch)
tree6d2b0fa1c897a26a8a92867a560c154bcf236490 /pkgs/data/fonts
parentd9642e006f8891ec9d047279a1a12eca6e8682ad (diff)
downloadnixpkgs-4f8197bcc04de9bd5aa4da5114d0246fa4cbd03e.tar
nixpkgs-4f8197bcc04de9bd5aa4da5114d0246fa4cbd03e.tar.gz
nixpkgs-4f8197bcc04de9bd5aa4da5114d0246fa4cbd03e.tar.bz2
nixpkgs-4f8197bcc04de9bd5aa4da5114d0246fa4cbd03e.tar.lz
nixpkgs-4f8197bcc04de9bd5aa4da5114d0246fa4cbd03e.tar.xz
nixpkgs-4f8197bcc04de9bd5aa4da5114d0246fa4cbd03e.tar.zst
nixpkgs-4f8197bcc04de9bd5aa4da5114d0246fa4cbd03e.zip
twitter-color-emoji: build with python3
This can now be marked as un-broken.
Diffstat (limited to 'pkgs/data/fonts')
-rw-r--r--pkgs/data/fonts/twitter-color-emoji/default.nix22
1 files changed, 19 insertions, 3 deletions
diff --git a/pkgs/data/fonts/twitter-color-emoji/default.nix b/pkgs/data/fonts/twitter-color-emoji/default.nix
index bb22ec517c2..cb26beb3982 100644
--- a/pkgs/data/fonts/twitter-color-emoji/default.nix
+++ b/pkgs/data/fonts/twitter-color-emoji/default.nix
@@ -4,12 +4,13 @@
 { stdenv
 , fetchFromGitHub
 , cairo
-, imagemagick
+, graphicsmagick
 , pkg-config
 , pngquant
 , python3
 , which
 , zopfli
+, fetchpatch
 }:
 
 let
@@ -55,7 +56,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cairo
-    imagemagick
+    graphicsmagick
     pkg-config
     pngquant
     python
@@ -63,6 +64,22 @@ stdenv.mkDerivation rec {
     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
   };
 }