From ef871b4b84f6481d8c1b79c312fc60262bc5dd47 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Tue, 23 Sep 2025 09:33:04 +0800
Subject: [PATCH 1/2] spnavcfg: 1.1 -> 1.3

Diff: https://github.com/FreeSpacenav/spnavcfg/compare/v1.1...v1.3
---
 pkgs/by-name/sp/spnavcfg/package.nix | 30 +++++++++++-----------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/sp/spnavcfg/package.nix b/pkgs/by-name/sp/spnavcfg/package.nix
index 7c431a6a6ea1..a8eb341836c3 100644
--- a/pkgs/by-name/sp/spnavcfg/package.nix
+++ b/pkgs/by-name/sp/spnavcfg/package.nix
@@ -1,43 +1,37 @@
 {
-  stdenv,
   lib,
+  stdenv,
   fetchFromGitHub,
-  fetchpatch,
   pkg-config,
   libspnav,
-  libX11,
-
-  # Qt6 support is close: https://github.com/FreeSpacenav/spnavcfg/issues/43
-  libsForQt5,
+  qt6,
 }:
+
 stdenv.mkDerivation (finalAttrs: {
   pname = "spnavcfg";
-  version = "1.1";
+  version = "1.3";
 
   src = fetchFromGitHub {
     owner = "FreeSpacenav";
     repo = "spnavcfg";
     tag = "v${finalAttrs.version}";
     fetchLFS = true;
-    hash = "sha256-P3JYhZnaCxzJETwC4g5m4xAGBk28/Va7Z/ybqwacIaA=";
+    hash = "sha256-HYBb1/SgjayJjdA0N8UHPde3y4SugYiWIPP+3Eu3CEI=";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/FreeSpacenav/spnavcfg/commit/fd9aa10fb8e19a257398757943b3d8e79906e583.patch";
-      hash = "sha256-XKEyLAFrA4qRU3zkBozblb/fKtLKsaItze0xv1uLnq0=";
-    })
-  ];
-
   nativeBuildInputs = [
     pkg-config
-    libsForQt5.wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    libsForQt5.qtbase
+    qt6.qtbase
     libspnav
-    libX11
+  ];
+
+  configureFlags = [
+    "--qt6"
+    "--qt-tooldir=${qt6.qtbase}/libexec"
   ];
 
   meta = with lib; {

From 42d18185aad53b4ddaf603b063f2815dfea532c1 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Tue, 23 Sep 2025 09:33:33 +0800
Subject: [PATCH 2/2] spnavcfg: remove with lib

---
 pkgs/by-name/sp/spnavcfg/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/sp/spnavcfg/package.nix b/pkgs/by-name/sp/spnavcfg/package.nix
index a8eb341836c3..bf70e26d3a54 100644
--- a/pkgs/by-name/sp/spnavcfg/package.nix
+++ b/pkgs/by-name/sp/spnavcfg/package.nix
@@ -34,12 +34,12 @@ stdenv.mkDerivation (finalAttrs: {
     "--qt-tooldir=${qt6.qtbase}/libexec"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://spacenav.sourceforge.net/";
     description = "Interactive configuration GUI for space navigator input devices";
-    license = licenses.gpl3Plus;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "spnavcfg";
   };
 })