diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-10-25 15:22:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-25 15:22:54 +0200 |
| commit | 8ee9c8d3ed07609f36f9ffb1b399caf926301c28 (patch) | |
| tree | cc458e5eabb3820c4668a0a2e68b3a0280b7f89c /pkgs/games | |
| parent | 25834450642e8903f01b6736f99e6679aa765b31 (diff) | |
| parent | 00b57fb2c09774fa376b3f5935af78b7b981d9fa (diff) | |
Merge pull request #192118 from SuperSamus/rare
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/rare/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/games/rare/fix-instance.patch | 10 |
2 files changed, 17 insertions, 10 deletions
diff --git a/pkgs/games/rare/default.nix b/pkgs/games/rare/default.nix index d23645242fdfb..5392062585c73 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 0000000000000..9f0ed0600d626 --- /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 |