From 39b5f2cd31f303af429a80c146a319f05b982615 Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Thu, 27 Jun 2024 01:42:22 +0900 Subject: [PATCH 1/4] lgogdownloader: 3.12 -> 3.14 Signed-off-by: Ludovico Piero (cherry picked from commit e52335e6f463cc723cad440d0c6f455e044ec582) --- pkgs/games/lgogdownloader/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix index a03a05bcb3569..c0eaa3cd93f69 100644 --- a/pkgs/games/lgogdownloader/default.nix +++ b/pkgs/games/lgogdownloader/default.nix @@ -11,6 +11,7 @@ , rhash , tinyxml-2 , help2man +, html-tidy , wrapQtAppsHook , qtbase , qtwebengine @@ -22,19 +23,20 @@ stdenv.mkDerivation rec { pname = "lgogdownloader"; - version = "3.12"; + version = "3.14"; src = fetchFromGitHub { owner = "Sude-"; repo = "lgogdownloader"; - rev = "v${version}"; - hash = "sha256-IjZizO0HWDqtviY3TZ3AYYm5A0sU74YXjfFEtvQvv04="; + rev = "refs/tags/v${version}"; + hash = "sha256-pxYiSefscglHN53wvp38Ec4/3X46sWc56Y4YKNtqABQ="; }; nativeBuildInputs = [ cmake pkg-config help2man + html-tidy ] ++ lib.optional enableGui wrapQtAppsHook; buildInputs = [ From 2ad7b7075fd8e4fd2626b6c6059cd28b98dc7004 Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Thu, 27 Jun 2024 01:42:48 +0900 Subject: [PATCH 2/4] lgogdownloader: format with nixfmt Signed-off-by: Ludovico Piero (cherry picked from commit 6d6ec24782ada971635654564a7e058a6dd2e784) --- pkgs/games/lgogdownloader/default.nix | 67 ++++++++++++++------------- 1 file changed, 35 insertions(+), 32 deletions(-) diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix index c0eaa3cd93f69..f36ccd4df8b2d 100644 --- a/pkgs/games/lgogdownloader/default.nix +++ b/pkgs/games/lgogdownloader/default.nix @@ -1,24 +1,25 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, curl -, boost -, liboauth -, jsoncpp -, htmlcxx -, rhash -, tinyxml-2 -, help2man -, html-tidy -, wrapQtAppsHook -, qtbase -, qtwebengine -, testers -, lgogdownloader +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + curl, + boost, + liboauth, + jsoncpp, + htmlcxx, + rhash, + tinyxml-2, + help2man, + html-tidy, + wrapQtAppsHook, + qtbase, + qtwebengine, + testers, + lgogdownloader, -, enableGui ? true + enableGui ? true, }: stdenv.mkDerivation rec { @@ -39,18 +40,20 @@ stdenv.mkDerivation rec { html-tidy ] ++ lib.optional enableGui wrapQtAppsHook; - buildInputs = [ - boost - curl - htmlcxx - jsoncpp - liboauth - rhash - tinyxml-2 - ] ++ lib.optionals enableGui [ - qtbase - qtwebengine - ]; + buildInputs = + [ + boost + curl + htmlcxx + jsoncpp + liboauth + rhash + tinyxml-2 + ] + ++ lib.optionals enableGui [ + qtbase + qtwebengine + ]; cmakeFlags = lib.optional enableGui "-DUSE_QT_GUI=ON"; From 7d50e6b0c4e686aa8d743c24a97e25c37c1b23bd Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Thu, 27 Jun 2024 01:43:22 +0900 Subject: [PATCH 3/4] lgogdownloader: remove `meta = with lib;` Signed-off-by: Ludovico Piero (cherry picked from commit 67c56278a72833e7c1425f8c5d089a90158e13e9) --- pkgs/games/lgogdownloader/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix index f36ccd4df8b2d..6a543ec30cbe7 100644 --- a/pkgs/games/lgogdownloader/default.nix +++ b/pkgs/games/lgogdownloader/default.nix @@ -61,12 +61,12 @@ stdenv.mkDerivation rec { version = testers.testVersion { package = lgogdownloader; }; }; - meta = with lib; { + meta = { description = "Unofficial downloader to GOG.com for Linux users. It uses the same API as the official GOGDownloader"; mainProgram = "lgogdownloader"; homepage = "https://github.com/Sude-/lgogdownloader"; - license = licenses.wtfpl; - maintainers = with maintainers; [ _0x4A6F ]; - platforms = platforms.linux; + license = lib.licenses.wtfpl; + maintainers = with lib.maintainers; [ _0x4A6F ]; + platforms = lib.platforms.linux; }; } From a5456f496b011a198752b0e3d4cda22ea80eb5b0 Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Thu, 27 Jun 2024 03:01:31 +0900 Subject: [PATCH 4/4] lgogdownloader: move to `pkgs/by-name` Signed-off-by: Ludovico Piero (cherry picked from commit e18b0c24a2345af3f5357ffa300f67ad2e716664) --- .../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 6a543ec30cbe7..6bf32f3394187 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 4dd43d730763d..6568285fd62bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36835,8 +36835,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 { };