From 0df001137b8cf4556b077133412fe8ddbb8d4ec4 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sat, 12 Jul 2025 08:20:53 -0500
Subject: [PATCH] libremines: migrate to by-name

---
 .../li/libremines/package.nix}                | 27 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 13 insertions(+), 16 deletions(-)
 rename pkgs/{games/libremines/default.nix => by-name/li/libremines/package.nix} (66%)

diff --git a/pkgs/games/libremines/default.nix b/pkgs/by-name/li/libremines/package.nix
similarity index 66%
rename from pkgs/games/libremines/default.nix
rename to pkgs/by-name/li/libremines/package.nix
index b3b7cda9d4c6..2023e5ca9e01 100644
--- a/pkgs/games/libremines/default.nix
+++ b/pkgs/by-name/li/libremines/package.nix
@@ -3,46 +3,45 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  wrapQtAppsHook,
-  qtmultimedia,
-  qtwayland,
+  qt6,
+  qt6Packages,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libremines";
   version = "2.0.1";
 
   src = fetchFromGitHub {
     owner = "Bollos00";
-    repo = pname;
-    rev = "v${version}";
+    repo = "libremines";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-TQwjEgtqAvKnrpia6VloRgFwtq5TNDmxU+ZWjtEK/n8=";
   };
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs =
     [
-      qtmultimedia
+      qt6Packages.qtmultimedia
     ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [
-      qtwayland
+      qt6Packages.qtwayland
     ];
 
   cmakeFlags = [ "-DUSE_QT6=TRUE" ];
 
-  meta = with lib; {
+  meta = {
     description = "Qt based Minesweeper game";
     mainProgram = "libremines";
     longDescription = ''
       A Free/Libre and Open Source Software Qt based Minesweeper game available for GNU/Linux, FreeBSD and Windows systems.
     '';
     homepage = "https://bollos00.github.io/LibreMines";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ aleksana ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ aleksana ];
+    platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b1703ecb84fc..d3cd91e996d0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8658,8 +8658,6 @@ with pkgs;
     inherit (lomiri) cmake-extras;
   };
 
-  libremines = qt6.callPackage ../games/libremines { };
-
   librepo = callPackage ../tools/package-management/librepo { };
 
   libretranslate = with python3.pkgs; toPythonApplication libretranslate;