From ecfb397e8a161be74755bad2d5b778c45346ee34 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 19 Jul 2019 10:51:02 -0400
Subject: [PATCH] libxkbcommon: fix build on darwin with upstream patch

---
 pkgs/development/libraries/libxkbcommon/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix
index ec4c904795f5..44530b381505 100644
--- a/pkgs/development/libraries/libxkbcommon/default.nix
+++ b/pkgs/development/libraries/libxkbcommon/default.nix
@@ -20,11 +20,13 @@ stdenv.mkDerivation rec {
     "-Dx-locale-root=${libX11.out}/share/X11/locale"
   ];
 
-  # Remove example program which fail on Darwin
-  postPatch = if stdenv.isDarwin then ''
-    substituteInPlace meson.build \
-      --replace "executable('rmlvo-to-keymap', 'test/rmlvo-to-keymap.c', dependencies: test_dep)" ""
-  '' else null;
+  patches = stdenv.lib.optionals stdenv.isDarwin [
+    # Fix build on darwin
+    (fetchpatch {
+      url = "https://github.com/xkbcommon/libxkbcommon/commit/32d178b50fe0da05e51e4fe8903c84371d133331.patch";
+      sha256 = "1wqdjla8hmgdqr8xc2manw363sxrqqsn3s8bd397h3cd7fj3hh1v";
+    })
+  ];
 
   doCheck = false; # fails, needs unicode locale