about summary refs log tree commit diff
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2020-02-03 14:35:41 -0500
committerFrederik Rietdijk <freddyrietdijk@fridh.nl>2020-02-05 10:38:54 +0100
commitcf83cfbd4c588076a82d8dfedddb2d9493568f45 (patch)
tree28fc5ee93ec4de281ad34c0f434628828bbd67a5
parentc55efd568ae1bfc2d9f7ee6c34595eface8f9fc5 (diff)
downloadnixlib-cf83cfbd4c588076a82d8dfedddb2d9493568f45.tar
nixlib-cf83cfbd4c588076a82d8dfedddb2d9493568f45.tar.gz
nixlib-cf83cfbd4c588076a82d8dfedddb2d9493568f45.tar.bz2
nixlib-cf83cfbd4c588076a82d8dfedddb2d9493568f45.tar.lz
nixlib-cf83cfbd4c588076a82d8dfedddb2d9493568f45.tar.xz
nixlib-cf83cfbd4c588076a82d8dfedddb2d9493568f45.tar.zst
nixlib-cf83cfbd4c588076a82d8dfedddb2d9493568f45.zip
xorg.libXft: add color emoji rendering support
https://gitlab.freedesktop.org/xorg/lib/libxft/merge_requests/1
-rw-r--r--pkgs/servers/x11/xorg/overrides.nix10
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 7a9ffcfc6469..a19ae62b1f49 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -182,6 +182,16 @@ self: super:
     propagatedBuildInputs = [ self.libXrender freetype fontconfig ];
     configureFlags = attrs.configureFlags or []
       ++ malloc0ReturnsNullCrossFlag;
+
+    patches = [
+      # Adds color emoji rendering support.
+      # https://gitlab.freedesktop.org/xorg/lib/libxft/merge_requests/1
+      (fetchpatch {
+        url = "https://gitlab.freedesktop.org/xorg/lib/libxft/commit/fe41537b5714a2301808eed2d76b2e7631176573.patch";
+        sha256 = "045lp1q50i2wlwvpsq6ycxdc6p3asm2r3bk2nbad1dwkqw2xf9jc";
+      })
+    ];
+
     # the include files need ft2build.h, and Requires.private isn't enough for us
     postInstall = ''
       sed "/^Requires:/s/$/, freetype2/" -i "$dev/lib/pkgconfig/xft.pc"