diff --git a/pkgs/games/rare/default.nix b/pkgs/games/rare/default.nix index d23645242fdf..5392062585c7 100644 --- a/pkgs/games/rare/default.nix +++ b/pkgs/games/rare/default.nix @@ -1,16 +1,15 @@ { lib, fetchFromGitHub, buildPythonApplication, qt5 -, psutil, pypresence, pyqt5, python, qtawesome, requests }: +, legendary-gl, pypresence, pyqt5, python, qtawesome, requests, typing-extensions }: buildPythonApplication rec { pname = "rare"; - version = "1.8.9"; + version = "1.9.2"; src = fetchFromGitHub { owner = "Dummerle"; repo = "Rare"; rev = version; - sha256 = "sha256-2l8Id+bA5Ugb8+3ioiZ78dUtDusU8cvZEAMhmYBcJFc="; - fetchSubmodules = true; + sha256 = "sha256-mL23tq5Fvd/kXAr7PZ+le5lRXwV3rKG/s8GuXE+S11M="; }; nativeBuildInputs = [ @@ -18,19 +17,17 @@ buildPythonApplication rec { ]; propagatedBuildInputs = [ - psutil + legendary-gl pypresence pyqt5 qtawesome requests + typing-extensions ]; - dontWrapQtApps = true; + patches = [ ./fix-instance.patch ]; - preBuild = '' - # Solves "PermissionError: [Errno 13] Permission denied: '/homeless-shelter'" - export HOME=$(mktemp -d) - ''; + dontWrapQtApps = true; postInstall = '' install -Dm644 misc/rare.desktop -t $out/share/applications/ diff --git a/pkgs/games/rare/fix-instance.patch b/pkgs/games/rare/fix-instance.patch new file mode 100644 index 000000000000..9f0ed0600d62 --- /dev/null +++ b/pkgs/games/rare/fix-instance.patch @@ -0,0 +1,10 @@ +diff --git a/rare/utils/misc.py b/rare/utils/misc.py +index 4492074..5352dac 100644 +--- a/rare/utils/misc.py ++++ b/rare/utils/misc.py +@@ -190,6 +190,7 @@ def get_rare_executable() -> List[str]: + executable = [sys.executable] + + executable[0] = os.path.abspath(executable[0]) ++ executable.pop(0) + return executable diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05182417be43..b67e4d56431d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34099,7 +34099,7 @@ with pkgs; leela-zero = libsForQt5.callPackage ../games/leela-zero { }; - legendary-gl = python38Packages.callPackage ../games/legendary-gl { }; + legendary-gl = python3Packages.callPackage ../games/legendary-gl { }; left4gore-bin = callPackage ../games/left4gore { };