From e18b0c24a2345af3f5357ffa300f67ad2e716664 Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Thu, 27 Jun 2024 03:01:31 +0900 Subject: [PATCH] lgogdownloader: move to `pkgs/by-name` Signed-off-by: Ludovico Piero --- .../lg/lgogdownloader/package.nix} | 10 ++++------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 4 insertions(+), 8 deletions(-) rename pkgs/{games/lgogdownloader/default.nix => by-name/lg/lgogdownloader/package.nix} (90%) diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/by-name/lg/lgogdownloader/package.nix similarity index 90% rename from pkgs/games/lgogdownloader/default.nix rename to pkgs/by-name/lg/lgogdownloader/package.nix index 6a543ec30cbe..6bf32f339418 100644 --- a/pkgs/games/lgogdownloader/default.nix +++ b/pkgs/by-name/lg/lgogdownloader/package.nix @@ -13,9 +13,7 @@ tinyxml-2, help2man, html-tidy, - wrapQtAppsHook, - qtbase, - qtwebengine, + libsForQt5, testers, lgogdownloader, @@ -38,7 +36,7 @@ stdenv.mkDerivation rec { pkg-config help2man html-tidy - ] ++ lib.optional enableGui wrapQtAppsHook; + ] ++ lib.optional enableGui libsForQt5.wrapQtAppsHook; buildInputs = [ @@ -51,8 +49,8 @@ stdenv.mkDerivation rec { tinyxml-2 ] ++ lib.optionals enableGui [ - qtbase - qtwebengine + libsForQt5.qtbase + libsForQt5.qtwebengine ]; cmakeFlags = lib.optional enableGui "-DUSE_QT_GUI=ON"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04cb6100324c..c4a1c7bf58e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36683,8 +36683,6 @@ with pkgs; left4gore-bin = callPackage ../games/left4gore { }; - lgogdownloader = libsForQt5.callPackage ../games/lgogdownloader { }; - liberal-crime-squad = callPackage ../games/liberal-crime-squad { }; liberation-circuit = callPackage ../games/liberation-circuit { };