From 704686cc6bb17c389c27259a764d823609bc09fa Mon Sep 17 00:00:00 2001
From: Stig Palmquist <git@stig.io>
Date: Tue, 29 Jul 2025 17:06:45 +0200
Subject: [PATCH] xkeyboard-config: add patch to fix us-mac

Add a patch that reverts a commit in 2.45 that broke the us-mac keyboard
layout.

Remove when 2.46 is released

https://github.com/NixOS/nixpkgs/issues/426375
---
 pkgs/by-name/xk/xkeyboard-config/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/xk/xkeyboard-config/package.nix b/pkgs/by-name/xk/xkeyboard-config/package.nix
index 2862769bb6cb..666de77d7b00 100644
--- a/pkgs/by-name/xk/xkeyboard-config/package.nix
+++ b/pkgs/by-name/xk/xkeyboard-config/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch2,
   pkg-config,
   meson,
   ninja,
@@ -20,6 +21,16 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-Fp4HWpLZV6V3h8GZ6E41nfKTG3GWwcW0o9V27mI1qHw=";
   };
 
+  patches = [
+    # Patch that reverts a commit in 2.45 that broke the us-mac keyboard layout.
+    # Remove when 2.46 is released.
+    # https://github.com/NixOS/nixpkgs/issues/426375
+    (fetchpatch2 {
+      url = "https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/11dbaeb23d06c0d21efe538c90b44ffc8fc3a071.patch";
+      hash = "sha256-qZkO1GQvbtTFeXqCuA7bjgQX5jq9c+LiKa/ziP1w2sI=";
+    })
+  ];
+
   strictDeps = true;
 
   nativeBuildInputs = [