From bc59787bc1c93ee97061d024f0498ccc5371fd7b Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Mon, 26 Jan 2026 02:29:39 +0100 Subject: [PATCH] pokefinder: move to pkgs/by-name this shouldn't create any rebuilds --- .../po/pokefinder/package.nix} | 14 +++++--------- .../po}/pokefinder/set-desktop-file-name.patch | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 5 insertions(+), 11 deletions(-) rename pkgs/{tools/games/pokefinder/default.nix => by-name/po/pokefinder/package.nix} (91%) rename pkgs/{tools/games => by-name/po}/pokefinder/set-desktop-file-name.patch (100%) diff --git a/pkgs/tools/games/pokefinder/default.nix b/pkgs/by-name/po/pokefinder/package.nix similarity index 91% rename from pkgs/tools/games/pokefinder/default.nix rename to pkgs/by-name/po/pokefinder/package.nix index f291d461e23e..8755f55770f4 100644 --- a/pkgs/tools/games/pokefinder/default.nix +++ b/pkgs/by-name/po/pokefinder/package.nix @@ -4,14 +4,10 @@ copyDesktopItems, makeDesktopItem, fetchFromGitHub, - fetchpatch, cmake, python3, - qtbase, - qttools, - qtwayland, + qt6, imagemagick, - wrapQtAppsHook, gitUpdater, }: @@ -53,7 +49,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - wrapQtAppsHook + qt6.wrapQtAppsHook python3 ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ @@ -73,10 +69,10 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - qtbase - qttools + qt6.qtbase + qt6.qttools ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6.qtwayland ]; passthru.updateScript = gitUpdater { rev-prefix = "v"; diff --git a/pkgs/tools/games/pokefinder/set-desktop-file-name.patch b/pkgs/by-name/po/pokefinder/set-desktop-file-name.patch similarity index 100% rename from pkgs/tools/games/pokefinder/set-desktop-file-name.patch rename to pkgs/by-name/po/pokefinder/set-desktop-file-name.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca13df5fe111..39a2b6c7aa9f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10943,8 +10943,6 @@ with pkgs; plover = recurseIntoAttrs (libsForQt5.callPackage ../applications/misc/plover { }); - pokefinder = qt6Packages.callPackage ../tools/games/pokefinder { }; - pothos = libsForQt5.callPackage ../applications/radio/pothos { }; # perhaps there are better apps for this task? It's how I had configured my previous system.