Merge pull request #67663 from jtojnar/fc-joypixels

fontconfig: add support for JoyPixels font
2019-08-30 00:30:13 +02:00
parent 2d00fed978 1a7b8f6817
commit 3665a31a4a
3 changed files with 28 additions and 9 deletions
@@ -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
@@ -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 -->