diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-12-11 16:24:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-11 16:24:10 +0100 |
| commit | c4aaf5a930b85bd95bee795a48a4c0fc8a24cdb2 (patch) | |
| tree | 98ab8a59213c674b835aef4c7e53e9b17ae8dbf3 /pkgs/games | |
| parent | cc4c44de5c0eaabb7c8cb3f0aa25ded435c9db17 (diff) | |
| parent | 780e8ab5a8731cc282ea215b1bf5dcffe597d2a5 (diff) | |
Merge pull request #272763 from MultisampledNight/rare-1.10.6
rare: 1.10.3 -> 1.10.7
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/rare/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/games/rare/legendary-gl-version.patch | 13 |
2 files changed, 8 insertions, 22 deletions
diff --git a/pkgs/games/rare/default.nix b/pkgs/games/rare/default.nix index 5253d78be5757..ac2970bd91e16 100644 --- a/pkgs/games/rare/default.nix +++ b/pkgs/games/rare/default.nix @@ -8,21 +8,24 @@ , python , qtawesome , requests +, setuptools , typing-extensions }: buildPythonApplication rec { pname = "rare"; - version = "1.10.3"; + version = "1.10.7"; + pyproject = true; src = fetchFromGitHub { - owner = "Dummerle"; + owner = "RareDevs"; repo = "Rare"; rev = "refs/tags/${version}"; - hash = "sha256-7KER9gCpqjEKikQTVHsvwX6efCb9L0ut6OBjjLBW2tI="; + hash = "sha256-rV6B9tCdwWK9yvEtVyLnv4Lo1WP5xW0f4JcsNZ7iBGI="; }; nativeBuildInputs = [ + setuptools qt5.wrapQtAppsHook ]; @@ -35,11 +38,6 @@ buildPythonApplication rec { typing-extensions ]; - patches = [ - # Not able to run pythonRelaxDepsHook because of https://github.com/NixOS/nixpkgs/issues/198342 - ./legendary-gl-version.patch - ]; - dontWrapQtApps = true; postInstall = '' @@ -56,9 +54,10 @@ buildPythonApplication rec { meta = with lib; { description = "GUI for Legendary, an Epic Games Launcher open source alternative"; - homepage = "https://github.com/Dummerle/Rare"; + homepage = "https://github.com/RareDevs/Rare"; maintainers = with maintainers; [ wolfangaukang ]; license = licenses.gpl3Only; platforms = platforms.linux; + mainProgram = "rare"; }; } diff --git a/pkgs/games/rare/legendary-gl-version.patch b/pkgs/games/rare/legendary-gl-version.patch deleted file mode 100644 index 1ed9659d2b258..0000000000000 --- a/pkgs/games/rare/legendary-gl-version.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/setup.py b/setup.py -index 2416360..08de818 100644 ---- a/setup.py -+++ b/setup.py -@@ -7,7 +7,7 @@ with open("README.md", "r") as fh: - - requirements = [ - "requests<3.0", -- "legendary-gl==0.20.32", -+ "legendary-gl~=0.20.32", - "setuptools", - "wheel", - "PyQt5", |