From 87624b203e41248c2ad04352153e1ff73d1740fb Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Fri, 24 Oct 2025 14:33:20 -0700
Subject: [PATCH] qgo: modernize, move to by-name/

---
 .../{games => by-name/qg}/qgo/fix-paths.patch |  0
 .../qg/qgo/package.nix}                       | 24 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 3 files changed, 11 insertions(+), 15 deletions(-)
 rename pkgs/{games => by-name/qg}/qgo/fix-paths.patch (100%)
 rename pkgs/{games/qgo/default.nix => by-name/qg/qgo/package.nix} (82%)

diff --git a/pkgs/games/qgo/fix-paths.patch b/pkgs/by-name/qg/qgo/fix-paths.patch
similarity index 100%
rename from pkgs/games/qgo/fix-paths.patch
rename to pkgs/by-name/qg/qgo/fix-paths.patch
diff --git a/pkgs/games/qgo/default.nix b/pkgs/by-name/qg/qgo/package.nix
similarity index 82%
rename from pkgs/games/qgo/default.nix
rename to pkgs/by-name/qg/qgo/package.nix
index 68b4a9325b38..6f3b6384f660 100644
--- a/pkgs/games/qgo/default.nix
+++ b/pkgs/by-name/qg/qgo/package.nix
@@ -1,18 +1,15 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
+  libsForQt5,
   fetchFromGitHub,
-  qmake,
-  qtbase,
-  qtmultimedia,
-  qttools,
 }:
 
-mkDerivation {
+stdenv.mkDerivation {
   pname = "qgo";
   version = "unstable-2017-12-18";
 
-  meta = with lib; {
+  meta = {
     description = "Go client based on Qt5";
     mainProgram = "qgo";
     longDescription = ''
@@ -28,8 +25,8 @@ mkDerivation {
       Chinese, "囲碁(Yi Go)" in Japanese, "바둑(Baduk)" in Korean.
     '';
     homepage = "https://github.com/pzorin/qgo";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ zalakain ];
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ zalakain ];
   };
 
   src = fetchFromGitHub {
@@ -44,11 +41,12 @@ mkDerivation {
     sed -i 's|@out@|'"''${out}"'|g' src/src.pro src/defines.h
   '';
   nativeBuildInputs = [
-    qmake
-    qttools
+    libsForQt5.qmake
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
-    qtbase
-    qtmultimedia
+    libsForQt5.qtbase
+    libsForQt5.qtmultimedia
   ];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a7704edd6662..9068bf30a766 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13052,8 +13052,6 @@ with pkgs;
 
   fmodex = callPackage ../games/doom-ports/zandronum/fmod.nix { };
 
-  qgo = libsForQt5.callPackage ../games/qgo { };
-
   anki-utils = callPackage ../by-name/an/anki/addons/anki-utils.nix { };
   ankiAddons = recurseIntoAttrs (callPackage ../by-name/an/anki/addons { });