From 3f073a759a8dc7bcccb644b18b3e4a0e9f459295 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 13 Dec 2025 16:31:33 +0100
Subject: [PATCH] xf86-input-keyboard: refactor, move to pkgs/by-name & rename
 from xorg.xf86inputkeyboard

relevant changes:
- switch to GitLab source instead of release tarball

the package is strictly non-linux only so i tested the build of
pkgsCross.x86_64-freebsd on x86_64-linux
---
 .../xf/xf86-input-keyboard/package.nix        | 56 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 38 +------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  6 --
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 60 insertions(+), 43 deletions(-)
 create mode 100644 pkgs/by-name/xf/xf86-input-keyboard/package.nix

diff --git a/pkgs/by-name/xf/xf86-input-keyboard/package.nix b/pkgs/by-name/xf/xf86-input-keyboard/package.nix
new file mode 100644
index 000000000000..d3802e40a865
--- /dev/null
+++ b/pkgs/by-name/xf/xf86-input-keyboard/package.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  pkg-config,
+  util-macros,
+  xorgproto,
+  xorg-server,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xf86-input-keyboard";
+  version = "2.1.0";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "driver";
+    repo = "xf86-input-keyboard";
+    tag = "xf86-input-keyboard-${finalAttrs.version}";
+    hash = "sha256-M0D6oTAhnADI7pgWKt4ueHGbdMVDTVOXy3w07DGcCSg=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    util-macros
+  ];
+
+  buildInputs = [
+    xorgproto
+    xorg-server
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-input-keyboard-(.*)" ]; };
+  };
+
+  meta = {
+    description = "Keyboard input driver for non-Linux platforms for the Xorg X server";
+    homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-input-keyboard";
+    license = [
+      lib.licenses.x11
+      lib.licenses.hpndSellVariant
+    ]
+    # only solaris part is MIT
+    ++ lib.optional stdenv.hostPlatform.isSunOS lib.licenses.mit;
+    maintainers = [ ];
+    # platforms according to the readme:
+    # BSD, GNU Hurd, illumos & Solaris
+    platforms = with lib.platforms; freebsd ++ netbsd ++ openbsd ++ illumos;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 0e9d6e49a228..d9a880d46bd9 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -130,6 +130,7 @@
   xeyes,
   xf86-input-evdev,
   xf86-input-joystick,
+  xf86-input-keyboard,
   xf86-input-mouse,
   xf86-input-synaptics,
   xf86-input-vmmouse,
@@ -350,6 +351,7 @@ self: with self; {
   xcursorthemes = xcursor-themes;
   xf86inputevdev = xf86-input-evdev;
   xf86inputjoystick = xf86-input-joystick;
+  xf86inputkeyboard = xf86-input-keyboard;
   xf86inputmouse = xf86-input-mouse;
   xf86inputsynaptics = xf86-input-synaptics;
   xf86inputvmmouse = xf86-input-vmmouse;
@@ -360,42 +362,6 @@ self: with self; {
   xorgserver = xorg-server;
   xorgsgmldoctools = xorg-sgml-doctools;
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xf86inputkeyboard = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      xorgserver,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xf86-input-keyboard";
-      version = "2.1.0";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/driver/xf86-input-keyboard-2.1.0.tar.xz";
-        sha256 = "0mvwxrnkq0lzhjr894p420zxffdn34nc2scinmp7qd1hikr51kkp";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        xorgserver
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xf86inputlibinput = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 8c607cad0033..0959a27f60ff 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -462,6 +462,7 @@ print OUT <<EOF;
   xeyes,
   xf86-input-evdev,
   xf86-input-joystick,
+  xf86-input-keyboard,
   xf86-input-mouse,
   xf86-input-synaptics,
   xf86-input-vmmouse,
@@ -682,6 +683,7 @@ self: with self; {
   xcursorthemes = xcursor-themes;
   xf86inputevdev = xf86-input-evdev;
   xf86inputjoystick = xf86-input-joystick;
+  xf86inputkeyboard = xf86-input-keyboard;
   xf86inputmouse = xf86-input-mouse;
   xf86inputsynaptics = xf86-input-synaptics;
   xf86inputvmmouse = xf86-input-vmmouse;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index a20c0791f498..7b2e04302a5f 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -71,12 +71,6 @@ self: super:
 {
   mkfontdir = xorg.mkfontscale;
 
-  xf86inputkeyboard = super.xf86inputkeyboard.overrideAttrs (attrs: {
-    meta = attrs.meta // {
-      platforms = lib.platforms.freebsd ++ lib.platforms.netbsd ++ lib.platforms.openbsd;
-    };
-  });
-
   xf86inputlibinput = super.xf86inputlibinput.overrideAttrs (attrs: {
     outputs = [
       "out"
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 86db59ed2efb..d8624f8a9233 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -1,4 +1,3 @@
-mirror://xorg/individual/driver/xf86-input-keyboard-2.1.0.tar.xz
 mirror://xorg/individual/driver/xf86-input-libinput-1.5.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-amdgpu-23.0.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2