diff options
author | Emily <vcs@emily.moe> | 2020-04-23 20:55:26 +0100 |
---|---|---|
committer | Emily <vcs@emily.moe> | 2020-04-23 21:38:59 +0100 |
commit | 63b70bb4ef4d1ed7dd3546b039d9bf53c1483075 (patch) | |
tree | ead394f74cde716d14867f3123ec25cb1923156f /pkgs/data/fonts/twitter-color-emoji | |
parent | 22a3bf9fb9edad917fb6cd1066d58b5e426ee975 (diff) | |
download | nixpkgs-63b70bb4ef4d1ed7dd3546b039d9bf53c1483075.tar nixpkgs-63b70bb4ef4d1ed7dd3546b039d9bf53c1483075.tar.gz nixpkgs-63b70bb4ef4d1ed7dd3546b039d9bf53c1483075.tar.bz2 nixpkgs-63b70bb4ef4d1ed7dd3546b039d9bf53c1483075.tar.lz nixpkgs-63b70bb4ef4d1ed7dd3546b039d9bf53c1483075.tar.xz nixpkgs-63b70bb4ef4d1ed7dd3546b039d9bf53c1483075.tar.zst nixpkgs-63b70bb4ef4d1ed7dd3546b039d9bf53c1483075.zip |
twitter-color-emoji: 12.1.2 -> 12.1.5
Twemoji version bump, plus a Fedora patch update to fix emoji size: https://src.fedoraproject.org/rpms/twitter-twemoji-fonts/c/282c789d3742d223968a7ddcae6e65374f6dcae1?branch=master
Diffstat (limited to 'pkgs/data/fonts/twitter-color-emoji')
-rw-r--r-- | pkgs/data/fonts/twitter-color-emoji/default.nix | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/data/fonts/twitter-color-emoji/default.nix b/pkgs/data/fonts/twitter-color-emoji/default.nix index 4e464f37022..0e835cbedea 100644 --- a/pkgs/data/fonts/twitter-color-emoji/default.nix +++ b/pkgs/data/fonts/twitter-color-emoji/default.nix @@ -1,4 +1,4 @@ -# Based upon https://src.fedoraproject.org/rpms/twitter-twemoji-fonts/tree/454acad50ba584d9602ccd4238fc5e585abc15c9 +# Based upon https://src.fedoraproject.org/rpms/twitter-twemoji-fonts # The main difference is that we use “Twitter Color Emoji” name (which is recognized by upstream fontconfig) { stdenv @@ -15,14 +15,14 @@ }: let - version = "12.1.2"; + version = "12.1.5"; twemojiSrc = fetchFromGitHub { name = "twemoji"; owner = "twitter"; repo = "twemoji"; rev = "v${version}"; - sha256 = "0vzmlp83vnk4njcfkn03jcc1vkg2rf12zf5kj3p3a373xr4ds1zn"; + hash = "sha256-qb3bLiUgtA8QQ13u928kvM+3qwmQpyjUk0EPKja1kSk="; }; in @@ -54,10 +54,10 @@ stdenv.mkDerivation rec { ]; patches = [ - # ImageMagick -> GrahphicsMagick + # ImageMagick -> GraphicsMagick (fetchpatch { - url = "https://src.fedoraproject.org/rpms/twitter-twemoji-fonts/raw/3bc176c10ced2824fe03da5ff561e22a36bf8ccd/f/noto-emoji-use-gm.patch"; - sha256 = "0yfmfzaaiq5163c06172g4r734aysiqyv1s28siv642vqzsqh4i2"; + url = "https://src.fedoraproject.org/rpms/twitter-twemoji-fonts/raw/07778605d50696f6aa929020e82611a01d254c90/f/noto-emoji-use-gm.patch"; + sha256 = "sha256-kyJwT1SKS1vnXxvPTiIMK6TRHMp1ZOSlb6rodL4Jbxs="; }) ]; @@ -114,7 +114,9 @@ stdenv.mkDerivation rec { # In twemoji source ## Artwork is Creative Commons Attribution 4.0 International ## Non-artwork is MIT + # In Fedora twitter-twemoji-fonts source + ## spec files are MIT: https://fedoraproject.org/wiki/Licensing:Main#License_of_Fedora_SPEC_Files license = with licenses; [ asl20 ofl cc-by-40 mit ]; - maintainers = with maintainers; [ jtojnar ]; + maintainers = with maintainers; [ jtojnar emily ]; }; } |