summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2019-05-02 23:56:56 +0000
committerGitHub <noreply@github.com>2019-05-02 23:56:56 +0000
commit3e3db49d9d780eddcf37f8720c67577a38d69bff (patch)
tree5a51d116c7368714b3a241db13dffdfa9bed1fd7 /pkgs
parenta1b30312328d80b3479c04d7cd784f03acccd9fd (diff)
parent367b046b8c6c6c6700bb7847d62e9c8e84677f05 (diff)
downloadnixpkgs-3e3db49d9d780eddcf37f8720c67577a38d69bff.tar
nixpkgs-3e3db49d9d780eddcf37f8720c67577a38d69bff.tar.gz
nixpkgs-3e3db49d9d780eddcf37f8720c67577a38d69bff.tar.bz2
nixpkgs-3e3db49d9d780eddcf37f8720c67577a38d69bff.tar.lz
nixpkgs-3e3db49d9d780eddcf37f8720c67577a38d69bff.tar.xz
nixpkgs-3e3db49d9d780eddcf37f8720c67577a38d69bff.tar.zst
nixpkgs-3e3db49d9d780eddcf37f8720c67577a38d69bff.zip
Merge pull request #60742 from fgaz/twemoji/12
 twemoji-color-font: 11.2.0 -> 12.0.1 + refactor
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/data/fonts/twemoji-color-font/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/data/fonts/twemoji-color-font/default.nix b/pkgs/data/fonts/twemoji-color-font/default.nix
index d7963f6395a..52d11bfd622 100644
--- a/pkgs/data/fonts/twemoji-color-font/default.nix
+++ b/pkgs/data/fonts/twemoji-color-font/default.nix
@@ -1,12 +1,13 @@
 { stdenv, fetchFromGitHub, inkscape, imagemagick, potrace, svgo, scfbuild }:
 
 stdenv.mkDerivation rec {
-  name = "twemoji-color-font-${meta.version}";
+  pname = "twemoji-color-font";
+  version = "12.0.1";
   src = fetchFromGitHub {
     owner = "eosrei";
     repo = "twemoji-color-font";
-    rev = "v${meta.version}";
-    sha256 = "07yawvbdkk15d7ac9dj7drs1rqln9sba1fd6jx885ms7ww2sfm7r";
+    rev = "v${version}";
+    sha256 = "00pbgqpkq21wl8fs0q1xp49xb10m48b9sz8cdc58flkd2vqfssw2";
   };
 
   nativeBuildInputs = [ inkscape imagemagick potrace svgo scfbuild ];
@@ -21,7 +22,6 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    version = "11.2.0";
     description = "Color emoji SVGinOT font using Twitter Unicode 10 emoji with diversity and country flags";
     longDescription = ''
       A color and B&W emoji SVGinOT font built from the Twitter Emoji for