From b5fda38b50f6428edc0b0f9a48da9083fbc5a628 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Fri, 1 Aug 2025 14:29:17 +0000
Subject: [PATCH] punes: migrate to by-name

punes: create overrides
---
 pkgs/by-name/pu/punes-qt6/package.nix         |  7 +++++
 .../pu/punes/package.nix}                     | 30 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  4 ---
 3 files changed, 25 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/by-name/pu/punes-qt6/package.nix
 rename pkgs/{applications/emulators/punes/default.nix => by-name/pu/punes/package.nix} (80%)

diff --git a/pkgs/by-name/pu/punes-qt6/package.nix b/pkgs/by-name/pu/punes-qt6/package.nix
new file mode 100644
index 000000000000..8b89e6951278
--- /dev/null
+++ b/pkgs/by-name/pu/punes-qt6/package.nix
@@ -0,0 +1,7 @@
+{
+  punes,
+}:
+
+punes.override {
+  withQt6 = true;
+}
diff --git a/pkgs/applications/emulators/punes/default.nix b/pkgs/by-name/pu/punes/package.nix
similarity index 80%
rename from pkgs/applications/emulators/punes/default.nix
rename to pkgs/by-name/pu/punes/package.nix
index 1267a40b4b26..02b06b13a3c9 100644
--- a/pkgs/applications/emulators/punes/default.nix
+++ b/pkgs/by-name/pu/punes/package.nix
@@ -12,12 +12,14 @@
   libX11,
   libXrandr,
   sndio,
-  qtbase,
-  qtsvg,
-  qttools,
-  wrapQtAppsHook,
+  libsForQt5,
+  qt6Packages,
+  withQt6 ? false,
 }:
 
+let
+  qtPackages = if withQt6 then qt6Packages else libsForQt5;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "punes";
   version = "0.111";
@@ -25,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "punesemu";
     repo = "puNES";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-TIXjYkInWV3yVnvXrdHcmeWYeps5TcvkG2Xjg4roIds=";
   };
 
@@ -50,16 +52,20 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     pkg-config
+  ]
+  ++ (with qtPackages; [
     qttools
     wrapQtAppsHook
-  ];
+  ]);
 
   buildInputs = [
     ffmpeg
     libGLU
+  ]
+  ++ (with qtPackages; [
     qtbase
     qtsvg
-  ]
+  ])
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib
     libX11
@@ -74,20 +80,20 @@ stdenv.mkDerivation (finalAttrs: {
     "-DENABLE_RELEASE=ON"
     "-DENABLE_FFMPEG=ON"
     "-DENABLE_OPENGL=ON"
-    "-DENABLE_QT6_LIBS=${if lib.versionAtLeast qtbase.version "6.0" then "ON" else "OFF"}"
+    (lib.strings.cmakeBool "ENABLE_QT6_LIBS" withQt6)
   ];
 
   passthru.updateScript = gitUpdater {
     rev-prefix = "v";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Qt-based Nintendo Entertainment System emulator and NSF/NSFe Music Player";
     mainProgram = "punes";
     homepage = "https://github.com/punesemu/puNES";
     changelog = "https://github.com/punesemu/puNES/blob/v${finalAttrs.version}/ChangeLog";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ OPNA2608 ];
-    platforms = with platforms; linux ++ freebsd ++ openbsd ++ windows;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ OPNA2608 ];
+    platforms = with lib.platforms; linux ++ freebsd ++ openbsd ++ windows;
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6f4de0910ec4..0c545341a794 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1424,10 +1424,6 @@ with pkgs;
     in
     ppsspp.override argset;
 
-  punes = libsForQt5.callPackage ../applications/emulators/punes { };
-
-  punes-qt6 = qt6Packages.callPackage ../applications/emulators/punes { };
-
   py65 = with python3.pkgs; toPythonApplication py65;
 
   rmg-wayland = callPackage ../by-name/rm/rmg/package.nix {