From 5136088b472fb723588f62df6f59467d36b0e2c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Na=C3=AFm=20Favier?= <n@monade.li>
Date: Mon, 17 Jul 2023 13:47:22 +0200
Subject: [PATCH] sxhkd: apply patch for multiple layouts

The recent upgrade past xkeyboardconfig 2.37 causes an issue where sxhkd
will get confused if multiple keyboard layouts are used: https://github.com/baskerville/sxhkd/issues/289
---
 pkgs/tools/X11/sxhkd/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/X11/sxhkd/default.nix b/pkgs/tools/X11/sxhkd/default.nix
index 50e82643ac2..ab15c38168e 100644
--- a/pkgs/tools/X11/sxhkd/default.nix
+++ b/pkgs/tools/X11/sxhkd/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch
 , asciidoc
 , libxcb
 , xcbutil
@@ -19,6 +20,15 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-OelMqenk0tiWMLraekS/ggGf6IsXP7Sz7bv75NvnNvI=";
   };
 
+  patches = [
+    (fetchpatch {
+      # Fixes an issue with overlapping chords when using multiple keyboard layouts.
+      name = "sxhkd-mod5.patch";
+      url = "https://github.com/baskerville/sxhkd/pull/307/commits/35e64f1d7b54c97ccc02e84e278012dae9bc3941.patch";
+      hash = "sha256-bvXWEEITbHC/h0nXQx99SXjvkI/KO36XXNSa1O8KSY0=";
+    })
+  ];
+
   nativeBuildInputs = [
     asciidoc
   ];
@@ -36,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Simple X hotkey daemon";
     homepage = "https://github.com/baskerville/sxhkd";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ vyp AndersonTorres ];
+    maintainers = with maintainers; [ vyp AndersonTorres ncfavier ];
     platforms = platforms.linux;
   };
 })