From 37018e70d1bd94efee4927ce11df91b3930e48b2 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 29 Aug 2019 02:15:26 +0200
Subject: [PATCH 1/2] fontconfig: add support for JoyPixels font

Mirroring the following upstream merge request
https://gitlab.freedesktop.org/fontconfig/fontconfig/merge_requests/67
---
 .../libraries/fontconfig/default.nix          |  3 +++
 .../libraries/fontconfig/fix-joypixels.patch  | 23 +++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/libraries/fontconfig/fix-joypixels.patch

diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index f730e3e3408..d459a048350 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -30,6 +30,9 @@ stdenv.mkDerivation rec {
       src = ./config-compat.patch;
       inherit configVersion;
     })
+
+    # https://gitlab.freedesktop.org/fontconfig/fontconfig/merge_requests/67
+    ./fix-joypixels.patch
   ];
 
   outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config
diff --git a/pkgs/development/libraries/fontconfig/fix-joypixels.patch b/pkgs/development/libraries/fontconfig/fix-joypixels.patch
new file mode 100644
index 00000000000..d5654063fe8
--- /dev/null
+++ b/pkgs/development/libraries/fontconfig/fix-joypixels.patch
@@ -0,0 +1,23 @@
+--- a/conf.d/45-generic.conf
++++ b/conf.d/45-generic.conf
+@@ -5,6 +5,10 @@
+ 
+ <!-- Emoji -->
+ 
++	<alias binding="same">
++		<family>JoyPixels</family>
++		<default><family>emoji</family></default>
++	</alias>
+ 	<alias binding="same">
+ 		<family>Emoji Two</family>
+ 		<default><family>emoji</family></default>
+--- a/conf.d/60-generic.conf
++++ b/conf.d/60-generic.conf
+@@ -29,6 +29,7 @@
+ 	<alias binding="same">
+ 		<family>emoji</family>
+ 		<prefer>
++			<family>JoyPixels</family>
+ 			<family>Emoji Two</family>
+ 			<family>Emoji One</family>
+ 			<!-- System fonts -->

From 1a7b8f681724a9763b968ca8747a8ea2458dfca3 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 29 Aug 2019 02:17:49 +0200
Subject: [PATCH 2/2] joypixels: drop fontconfig file

It is now supportedby our fontconfig.
---
 pkgs/data/fonts/joypixels/default.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/data/fonts/joypixels/default.nix b/pkgs/data/fonts/joypixels/default.nix
index f54838d5a64..fc6481e9a89 100644
--- a/pkgs/data/fonts/joypixels/default.nix
+++ b/pkgs/data/fonts/joypixels/default.nix
@@ -1,13 +1,7 @@
 { stdenv, fetchurl }:
 
-let
-  fontconfig = fetchurl {
-    name = "75-joypixels.conf";
-    url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/75-joypixels.conf?h=packages/ttf-joypixels&id=b2b38f8393ec56ed7338c256f5b85f3439a2dfc3";
-    sha256 = "065y2fmf86zzvna1hrvcg46cnr7a76xd2mwa26nss861dsx6pnd6";
-  };
-in stdenv.mkDerivation rec {
-  pname = "emojione";
+stdenv.mkDerivation rec {
+  pname = "joypixels";
   version = "5.0.2";
 
   src = fetchurl {
@@ -19,7 +13,6 @@ in stdenv.mkDerivation rec {
 
   installPhase = ''
     install -Dm644 $src $out/share/fonts/truetype/joypixels.ttf
-    install -Dm644 ${fontconfig} $out/etc/fonts/conf.d/75-joypixels.conf
   '';
 
   meta = with stdenv.lib; {