diff --git a/pkgs/by-name/lg/lgogdownloader/package.nix b/pkgs/by-name/lg/lgogdownloader/package.nix new file mode 100644 index 000000000000..6bf32f339418 --- /dev/null +++ b/pkgs/by-name/lg/lgogdownloader/package.nix @@ -0,0 +1,70 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + curl, + boost, + liboauth, + jsoncpp, + htmlcxx, + rhash, + tinyxml-2, + help2man, + html-tidy, + libsForQt5, + testers, + lgogdownloader, + + enableGui ? true, +}: + +stdenv.mkDerivation rec { + pname = "lgogdownloader"; + version = "3.14"; + + src = fetchFromGitHub { + owner = "Sude-"; + repo = "lgogdownloader"; + rev = "refs/tags/v${version}"; + hash = "sha256-pxYiSefscglHN53wvp38Ec4/3X46sWc56Y4YKNtqABQ="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + help2man + html-tidy + ] ++ lib.optional enableGui libsForQt5.wrapQtAppsHook; + + buildInputs = + [ + boost + curl + htmlcxx + jsoncpp + liboauth + rhash + tinyxml-2 + ] + ++ lib.optionals enableGui [ + libsForQt5.qtbase + libsForQt5.qtwebengine + ]; + + cmakeFlags = lib.optional enableGui "-DUSE_QT_GUI=ON"; + + passthru.tests = { + version = testers.testVersion { package = lgogdownloader; }; + }; + + 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 = lib.licenses.wtfpl; + maintainers = with lib.maintainers; [ _0x4A6F ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix deleted file mode 100644 index a03a05bcb356..000000000000 --- a/pkgs/games/lgogdownloader/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, curl -, boost -, liboauth -, jsoncpp -, htmlcxx -, rhash -, tinyxml-2 -, help2man -, wrapQtAppsHook -, qtbase -, qtwebengine -, testers -, lgogdownloader - -, enableGui ? true -}: - -stdenv.mkDerivation rec { - pname = "lgogdownloader"; - version = "3.12"; - - src = fetchFromGitHub { - owner = "Sude-"; - repo = "lgogdownloader"; - rev = "v${version}"; - hash = "sha256-IjZizO0HWDqtviY3TZ3AYYm5A0sU74YXjfFEtvQvv04="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - help2man - ] ++ lib.optional enableGui wrapQtAppsHook; - - buildInputs = [ - boost - curl - htmlcxx - jsoncpp - liboauth - rhash - tinyxml-2 - ] ++ lib.optionals enableGui [ - qtbase - qtwebengine - ]; - - cmakeFlags = lib.optional enableGui "-DUSE_QT_GUI=ON"; - - passthru.tests = { - version = testers.testVersion { package = lgogdownloader; }; - }; - - meta = with lib; { - 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; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5fd2c7817aa9..c7ca23b08c30 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36674,8 +36674,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 { };