diff options
author | Artturi <Artturin@artturin.com> | 2022-12-03 15:18:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-03 15:18:59 +0200 |
commit | 31ebec3e88e7d84e6a88dc08d7bdb3361a72f8e5 (patch) | |
tree | e85c31b78a551650922bffb5171aaa4f1c73ed58 /pkgs/games | |
parent | 7ec9d3e944583f904deaceb3afd89d85738afe15 (diff) | |
parent | 2518d6c0807b02e8e5fff78defe79dad99f616da (diff) |
Merge pull request #204211 from wackbyte/bump-grapejuice
grapejuice: 6.2.2 -> 7.2.0
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/grapejuice/default.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/games/grapejuice/default.nix b/pkgs/games/grapejuice/default.nix index f58596fccc129..1d67947d7accb 100644 --- a/pkgs/games/grapejuice/default.nix +++ b/pkgs/games/grapejuice/default.nix @@ -14,17 +14,18 @@ , winetricks , wine , glxinfo +, xrandr }: python3Packages.buildPythonApplication rec { pname = "grapejuice"; - version = "6.2.2"; + version = "7.2.0"; src = fetchFromGitLab { owner = "BrinkerVII"; repo = "grapejuice"; rev = "v${version}"; - sha256 = "sha256-wwM3q8Z4bYZod7/KcGc/PXlyLQxLRPkF1TdtFcg8mNE="; + sha256 = "sha256-BNVoSJbGi+u2DHuAicOjEUpDlmu25vMWoBudbV1FLgM="; }; nativeBuildInputs = [ @@ -50,13 +51,14 @@ python3Packages.buildPythonApplication rec { requests unidecode click + pydantic ]; dontWrapGApps = true; makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" - "--prefix PATH : ${lib.makeBinPath [ xdg-user-dirs wine winetricks pciutils glxinfo ]}" + "--prefix PATH : ${lib.makeBinPath [ xdg-user-dirs wine winetricks pciutils glxinfo xrandr ]}" # make xdg-open overrideable at runtime "--suffix PATH : ${lib.makeBinPath [ xdg-utils ]}" ]; @@ -82,8 +84,8 @@ python3Packages.buildPythonApplication rec { substituteInPlace src/grapejuice_common/paths.py \ --replace 'return local_share() / "locale"' 'return Path("${placeholder "out"}/share/locale")' - substituteInPlace src/grapejuice_common/features/settings.py \ - --replace 'k_default_wine_home: "",' 'k_default_wine_home: "${wine}",' + substituteInPlace src/grapejuice_common/models/settings_model.py \ + --replace 'default_wine_home: Optional[str] = ""' 'default_wine_home: Optional[str] = "${wine}"' ''; postInstall = '' |