diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-08-30 00:30:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-30 00:30:13 +0200 |
| commit | 3665a31a4a40795c750780e9bef327dec6a32683 (patch) | |
| tree | ecaef102713a735b540136d1284ad0e38bb2df6b /pkgs/development/libraries/fontconfig | |
| parent | 2d00fed978e5be047cce26e50ffdf1a446a1d817 (diff) | |
| parent | 1a7b8f681724a9763b968ca8747a8ea2458dfca3 (diff) | |
| download | nixpkgs-3665a31a4a40795c750780e9bef327dec6a32683.tar nixpkgs-3665a31a4a40795c750780e9bef327dec6a32683.tar.gz nixpkgs-3665a31a4a40795c750780e9bef327dec6a32683.tar.bz2 nixpkgs-3665a31a4a40795c750780e9bef327dec6a32683.tar.lz nixpkgs-3665a31a4a40795c750780e9bef327dec6a32683.tar.xz nixpkgs-3665a31a4a40795c750780e9bef327dec6a32683.tar.zst nixpkgs-3665a31a4a40795c750780e9bef327dec6a32683.zip | |
Merge pull request #67663 from jtojnar/fc-joypixels
fontconfig: add support for JoyPixels font
Diffstat (limited to 'pkgs/development/libraries/fontconfig')
| -rw-r--r-- | pkgs/development/libraries/fontconfig/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/fontconfig/fix-joypixels.patch | 23 |
2 files changed, 26 insertions, 0 deletions
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 186560ae101..5c9a0ecc71b 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 --> |