From 37018e70d1bd94efee4927ce11df91b3930e48b2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 29 Aug 2019 02:15:26 +0200 Subject: [PATCH] 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 @@ + + + ++ ++ JoyPixels ++ emoji ++ + + Emoji Two + emoji +--- a/conf.d/60-generic.conf ++++ b/conf.d/60-generic.conf +@@ -29,6 +29,7 @@ + + emoji + ++ JoyPixels + Emoji Two + Emoji One +