Merge pull request #154912 from Shardion/master

This commit is contained in:
Artturi 2022-01-15 21:19:48 +02:00 committed by GitHub
commit ec938613e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -11,17 +11,19 @@
, xdg-user-dirs , xdg-user-dirs
, wine , wine
, winetricks , winetricks
, pciutils
, glxinfo
}: }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "grapejuice"; pname = "grapejuice";
version = "3.64.16"; version = "4.10.2";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "BrinkerVII"; owner = "BrinkerVII";
repo = "grapejuice"; repo = "grapejuice";
rev = "a5bc65e094bbfb86e6142ac1da59017ddccff69e"; rev = "9a7cf806d35b4d53b3d3762339eba7d861b5043d";
sha256 = "sha256-3+5LWn+UBgLAX683MPHRHQMpW+gC5hGIwTtRVJHRWeE="; sha256 = "sha256-cKZv9qPCnl7i4kb6PG8RYx3HNLcwgI4d2zkw899MA6E=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -43,13 +45,14 @@ python3Packages.buildPythonApplication rec {
packaging packaging
psutil psutil
setuptools setuptools
unidecode
]; ];
dontWrapGApps = true; dontWrapGApps = true;
makeWrapperArgs = [ makeWrapperArgs = [
"\${gappsWrapperArgs[@]}" "\${gappsWrapperArgs[@]}"
"--prefix PATH : ${lib.makeBinPath [ xdg-user-dirs xdg-utils wine winetricks ]}" "--prefix PATH : ${lib.makeBinPath [ xdg-user-dirs xdg-utils wine winetricks pciutils glxinfo ]}"
]; ];
postPatch = '' postPatch = ''
@ -84,7 +87,7 @@ python3Packages.buildPythonApplication rec {
meta = with lib; { meta = with lib; {
homepage = "https://gitlab.com/brinkervii/grapejuice"; homepage = "https://gitlab.com/brinkervii/grapejuice";
description = "Simple Wine+Roblox management tool"; description = "A wine+Roblox management application";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ artturin ]; maintainers = with maintainers; [ artturin ];