Unverified Commit 8ee9c8d3 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #192118 from SuperSamus/rare

parents 25834450 00b57fb2
Loading
Loading
Loading
Loading
+7 −10
Original line number Diff line number Diff line
{ 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/
+10 −0
Original line number Diff line number Diff line
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
+1 −1
Original line number Diff line number Diff line
@@ -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 { };