summary refs log tree commit diff
path: root/pkgs/development/libraries
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2019-08-29 02:15:26 +0200
committerJan Tojnar <jtojnar@gmail.com>2019-08-29 02:15:26 +0200
commit37018e70d1bd94efee4927ce11df91b3930e48b2 (patch)
tree654ebd50d30f2b8cf14a91cdd0bed39bf5c36b8f /pkgs/development/libraries
parent3f4144c30a6351dd79b177328ec4dea03e2ce45f (diff)
downloadnixpkgs-37018e70d1bd94efee4927ce11df91b3930e48b2.tar
nixpkgs-37018e70d1bd94efee4927ce11df91b3930e48b2.tar.gz
nixpkgs-37018e70d1bd94efee4927ce11df91b3930e48b2.tar.bz2
nixpkgs-37018e70d1bd94efee4927ce11df91b3930e48b2.tar.lz
nixpkgs-37018e70d1bd94efee4927ce11df91b3930e48b2.tar.xz
nixpkgs-37018e70d1bd94efee4927ce11df91b3930e48b2.tar.zst
nixpkgs-37018e70d1bd94efee4927ce11df91b3930e48b2.zip
fontconfig: add support for JoyPixels font
Mirroring the following upstream merge request
https://gitlab.freedesktop.org/fontconfig/fontconfig/merge_requests/67
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r--pkgs/development/libraries/fontconfig/default.nix3
-rw-r--r--pkgs/development/libraries/fontconfig/fix-joypixels.patch23
2 files changed, 26 insertions, 0 deletions
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 -->