From 29dcdca5c303748381f0c73297e59aaa5c37c77b Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Mon, 4 Aug 2025 16:14:33 -0400
Subject: [PATCH 1/3] qtappinstancemanager: init at 1.3.0

---
 .../qt/qtappinstancemanager/package.nix       | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 pkgs/by-name/qt/qtappinstancemanager/package.nix

diff --git a/pkgs/by-name/qt/qtappinstancemanager/package.nix b/pkgs/by-name/qt/qtappinstancemanager/package.nix
new file mode 100644
index 000000000000..c513a190740c
--- /dev/null
+++ b/pkgs/by-name/qt/qtappinstancemanager/package.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  qt6,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "qtappinstancemanager";
+  version = "1.3.0";
+
+  src = fetchFromGitHub {
+    owner = "oclero";
+    repo = "qtappinstancemanager";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-/zvNR/RHNV19ZI8d+58sotWxY16q2a7wWIBuKO52H5M=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  buildInputs = [
+    qt6.qtbase
+  ];
+
+  dontWrapQtApps = true;
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Single application instance manager for Qt6";
+    homepage = "https://github.com/oclero/qtappinstancemanager";
+    changelog = "https://github.com/oclero/qtappinstancemanager/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ normalcea ];
+    mainProgram = "qtappinstancemanager";
+    platforms = lib.platforms.all;
+  };
+})

From aa70f7ce1486889364d9d15e430e49a30fd0c402 Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Mon, 4 Aug 2025 16:18:22 -0400
Subject: [PATCH 2/3] solarus-launcher: un-vendor qlementine within nixpkgs;
 refactor

---
 pkgs/by-name/so/solarus-launcher/package.nix | 47 +++++---------------
 1 file changed, 11 insertions(+), 36 deletions(-)

diff --git a/pkgs/by-name/so/solarus-launcher/package.nix b/pkgs/by-name/so/solarus-launcher/package.nix
index ce8cd109a307..0e5d799a5cbf 100644
--- a/pkgs/by-name/so/solarus-launcher/package.nix
+++ b/pkgs/by-name/so/solarus-launcher/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitLab,
-  fetchFromGitHub,
   replaceVars,
   cmake,
   ninja,
@@ -16,38 +15,12 @@
   libvorbis,
   solarus,
   glm,
-  qt6Packages,
-  kdePackages,
+  qt6,
+  qlementine,
+  qlementine-icons,
+  qtappinstancemanager,
 }:
 
-let
-  qlementine-icons-src = fetchFromGitHub {
-    owner = "oclero";
-    repo = "qlementine-icons";
-    tag = "v1.8.0";
-    hash = "sha256-FPndzMEOQvYNYUbT2V6iDlwoYqOww38GW/T3zUID3g0=";
-  };
-
-  qlementine-src = fetchFromGitHub {
-    owner = "oclero";
-    repo = "qlementine";
-    tag = "v1.2.1";
-    hash = "sha256-CPQMmTXyUW+CyLjHYx+IdXY4I2mVPudOmAksjd+izPA=";
-  };
-
-  qtappinstancemanager-src = fetchFromGitHub {
-    owner = "oclero";
-    repo = "qtappinstancemanager";
-    tag = "v1.3.0";
-    hash = "sha256-/zvNR/RHNV19ZI8d+58sotWxY16q2a7wWIBuKO52H5M=";
-  };
-
-  inherit (qt6Packages)
-    qtbase
-    qttools
-    wrapQtAppsHook
-    ;
-in
 stdenv.mkDerivation (finalAttrs: {
   pname = "solarus-launcher";
   version = "2.0.0";
@@ -61,7 +34,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [
     (replaceVars ./github-fetches.patch {
-      inherit qlementine-src qlementine-icons-src qtappinstancemanager-src;
+      qlementine-src = qlementine.src;
+      qlementine-icons-src = qlementine-icons.src;
+      qtappinstancemanager-src = qtappinstancemanager.src;
     })
   ];
 
@@ -69,8 +44,8 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     ninja
-    qttools
-    wrapQtAppsHook
+    qt6.qttools
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -83,8 +58,8 @@ stdenv.mkDerivation (finalAttrs: {
     libmodplug
     libvorbis
     solarus
-    qtbase
-    kdePackages.qtsvg
+    qt6.qtbase
+    qt6.qtsvg
     glm
   ];
 

From 9acb58f589bd7dd0fc3cea82a51415683a1b5d04 Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Mon, 4 Aug 2025 16:21:59 -0400
Subject: [PATCH 3/3] solarus-quest-editor: un-vendor qlementine within
 nixpkgs; refactor

---
 .../so/solarus-quest-editor/package.nix       | 29 +++++--------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/pkgs/by-name/so/solarus-quest-editor/package.nix b/pkgs/by-name/so/solarus-quest-editor/package.nix
index 124e26d348f2..d6b80649daad 100644
--- a/pkgs/by-name/so/solarus-quest-editor/package.nix
+++ b/pkgs/by-name/so/solarus-quest-editor/package.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchFromGitLab,
-  fetchFromGitHub,
   replaceVars,
+  qlementine,
   cmake,
   ninja,
   luajit,
@@ -16,24 +16,9 @@
   libvorbis,
   solarus,
   glm,
-  qt6Packages,
-  kdePackages,
+  qt6,
 }:
 
-let
-  qlementine-src = fetchFromGitHub {
-    owner = "oclero";
-    repo = "qlementine";
-    tag = "v1.2.0";
-    hash = "sha256-25PKOpQl3IkBXX14gt8KKYXXJKeutQ75O7BftEqCAxk=";
-  };
-
-  inherit (qt6Packages)
-    qtbase
-    qttools
-    wrapQtAppsHook
-    ;
-in
 stdenv.mkDerivation (finalAttrs: {
   pname = "solarus-quest-editor";
   version = "2.0.0";
@@ -46,15 +31,15 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   patches = [
-    (replaceVars ./qlementine-src.patch { inherit qlementine-src; })
+    (replaceVars ./qlementine-src.patch { qlementine-src = qlementine.src; })
   ];
 
   strictDeps = true;
   nativeBuildInputs = [
     cmake
     ninja
-    qttools
-    wrapQtAppsHook
+    qt6.qttools
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -67,8 +52,8 @@ stdenv.mkDerivation (finalAttrs: {
     libmodplug
     libvorbis
     solarus
-    qtbase
-    kdePackages.qtsvg
+    qt6.qtbase
+    qt6.qtsvg
     glm
   ];