public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #85889 from emilazy/twitter-color-emoji-12.1.5

Browse Source 
twitter-color-emoji: 12.1.2 -> 12.1.5
This commit is contained in:
Jan Tojnar 2020-04-24 08:59:20 +02:00 committed by GitHub
commit 79743fef7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/data/fonts/twitter-color-emoji/default.nix
View File

@ -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) # The main difference is that we use “Twitter Color Emoji” name (which is recognized by upstream fontconfig)
{ stdenv { stdenv
@ -15,14 +15,14 @@
}: }:
let let
version = "12.1.2"; version = "12.1.5";
twemojiSrc = fetchFromGitHub { twemojiSrc = fetchFromGitHub {
name = "twemoji"; name = "twemoji";
owner = "twitter"; owner = "twitter";
repo = "twemoji"; repo = "twemoji";
rev = "v${version}"; rev = "v${version}";
sha256 = "0vzmlp83vnk4njcfkn03jcc1vkg2rf12zf5kj3p3a373xr4ds1zn"; hash = "sha256-qb3bLiUgtA8QQ13u928kvM+3qwmQpyjUk0EPKja1kSk=";
}; };
in in
@ -54,10 +54,10 @@ stdenv.mkDerivation rec {
]; ];
patches = [ patches = [
# ImageMagick -> GrahphicsMagick # ImageMagick -> GraphicsMagick
(fetchpatch { (fetchpatch {
url = "https://src.fedoraproject.org/rpms/twitter-twemoji-fonts/raw/3bc176c10ced2824fe03da5ff561e22a36bf8ccd/f/noto-emoji-use-gm.patch"; url = "https://src.fedoraproject.org/rpms/twitter-twemoji-fonts/raw/07778605d50696f6aa929020e82611a01d254c90/f/noto-emoji-use-gm.patch";
sha256 = "0yfmfzaaiq5163c06172g4r734aysiqyv1s28siv642vqzsqh4i2"; sha256 = "sha256-kyJwT1SKS1vnXxvPTiIMK6TRHMp1ZOSlb6rodL4Jbxs=";
}) })
]; ];
@ -114,7 +114,9 @@ stdenv.mkDerivation rec {
# In twemoji source # In twemoji source
## Artwork is Creative Commons Attribution 4.0 International ## Artwork is Creative Commons Attribution 4.0 International
## Non-artwork is MIT ## 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 ]; license = with licenses; [ asl20 ofl cc-by-40 mit ];
maintainers = with maintainers; [ jtojnar ]; maintainers = with maintainers; [ jtojnar emily ];
}; };
} }