diff options
| author | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2020-08-26 13:20:01 +0200 |
|---|---|---|
| committer | Jon <jonringer@users.noreply.github.com> | 2020-08-30 10:17:23 -0700 |
| commit | fe3d667a0f0088303b4cacfbfddd487f5bf4ecfb (patch) | |
| tree | 4714554f21eefe75858333a12de434db2c105113 /pkgs/data/fonts/twitter-color-emoji | |
| parent | 0cfc9f47ceb48cd41427377cd3c1bb4942373253 (diff) | |
| download | nixpkgs-fe3d667a0f0088303b4cacfbfddd487f5bf4ecfb.tar nixpkgs-fe3d667a0f0088303b4cacfbfddd487f5bf4ecfb.tar.gz nixpkgs-fe3d667a0f0088303b4cacfbfddd487f5bf4ecfb.tar.bz2 nixpkgs-fe3d667a0f0088303b4cacfbfddd487f5bf4ecfb.tar.lz nixpkgs-fe3d667a0f0088303b4cacfbfddd487f5bf4ecfb.tar.xz nixpkgs-fe3d667a0f0088303b4cacfbfddd487f5bf4ecfb.tar.zst nixpkgs-fe3d667a0f0088303b4cacfbfddd487f5bf4ecfb.zip | |
twitter-color-emoji: 12.1.5 → 13.0.1
Diffstat (limited to 'pkgs/data/fonts/twitter-color-emoji')
| -rw-r--r-- | pkgs/data/fonts/twitter-color-emoji/default.nix | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/pkgs/data/fonts/twitter-color-emoji/default.nix b/pkgs/data/fonts/twitter-color-emoji/default.nix index ac3930853cf..8435957fe20 100644 --- a/pkgs/data/fonts/twitter-color-emoji/default.nix +++ b/pkgs/data/fonts/twitter-color-emoji/default.nix @@ -3,9 +3,8 @@ { stdenv , fetchFromGitHub -, fetchpatch , cairo -, graphicsmagick +, imagemagick , pkg-config , pngquant , python3 @@ -15,7 +14,7 @@ }: let - version = "12.1.5"; + version = "13.0.1"; twemojiSrc = fetchFromGitHub { name = "twemoji"; @@ -25,6 +24,9 @@ let sha256 = "0acinlv2l3s1jga2i9wh16mvgkxw4ipzgvjx8c80zd104lpdpgd9"; }; + pythonEnv = + python3.withPackages (p: [ p.fonttools p.nototools ]); + in stdenv.mkDerivation rec { pname = "twitter-color-emoji"; @@ -44,23 +46,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cairo - graphicsmagick + imagemagick pkg-config pngquant - python3 - python3.pkgs.nototools + pythonEnv which zopfli ]; - patches = [ - # ImageMagick -> GraphicsMagick - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/twitter-twemoji-fonts/raw/07778605d50696f6aa929020e82611a01d254c90/f/noto-emoji-use-gm.patch"; - sha256 = "06vg16z79s5adyjy8r3mr8fd391b1hi4xkqvbzkmnjwaai7p08lk"; - }) - ]; - postPatch = let templateSubstitutions = stdenv.lib.concatStringsSep "; " [ ''s#Noto Color Emoji#Twitter Color Emoji#'' @@ -74,7 +67,7 @@ stdenv.mkDerivation rec { ''s#http://scripts.sil.org/OFL#http://creativecommons.org/licenses/by/4.0/#'' ]; in '' - patchShebangs ./flag_glyph_name.py + ${noto-fonts-emoji.postPatch} sed '${templateSubstitutions}' NotoColorEmoji.tmpl.ttx.tmpl > TwitterColorEmoji.tmpl.ttx.tmpl pushd ${twemojiSrc.name}/assets/72x72/ @@ -88,6 +81,8 @@ stdenv.mkDerivation rec { "EMOJI=TwitterColorEmoji" "EMOJI_SRC_DIR=${twemojiSrc.name}/assets/72x72" "BODY_DIMENSIONS=76x72" + # twemoji contains some codepoints noto doesn't like + "BYPASS_SEQUENCE_CHECK=True" ]; enableParallelBuilding = true; |