MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 23:36:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #78647 from MetaDark/protontricks

Browse source 
protontricks: 1.3.1 -> 1.4
This commit is contained in:
Maximilian Bosch 2020-02-05 09:30:18 +01:00 committed by GitHub
commit e94e5cd03f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
pkgs/tools/package-management/protontricks/default.nix
View file

@ -1,18 +1,31 @@
{ stdenv, lib, buildPythonApplication, fetchFromGitHub
, vdf, wine, winetricks, zenity
, setuptools_scm, vdf
, wine, winetricks, zenity
, pytest
}:
buildPythonApplication rec {
pname = "protontricks";
version = "1.3.1";
version = "1.4";
src = fetchFromGitHub {
owner = "Matoking";
repo = pname;
rev = version;
sha256 = "0snhm9r5igik030iqxm3zd9zvhlnsxi20zac71bbc29qflsi2dhk";
sha256 = "1aarx6g8ykw1jvygfngmz8apdvfj26rcq10bwl228612kwigh7s2";
};
# Fix interpreter in mock run.sh for tests
postPatch = ''
substituteInPlace tests/conftest.py \
--replace '#!/bin/bash' '#!${stdenv.shell}' \
'';
preBuild = ''
export SETUPTOOLS_SCM_PRETEND_VERSION="${version}"
'';
nativeBuildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ vdf ];
# The wine install shipped with Proton must run under steam's
@ -24,12 +37,12 @@ buildPythonApplication rec {
"--set STEAM_RUNTIME 0"
"--set-default WINE ${wine}/bin/wine"
"--set-default WINESERVER ${wine}/bin/wineserver"
"--prefix PATH : ${lib.makeBinPath [
(winetricks.override { inherit wine; })
zenity
]}"
"--prefix PATH : ${lib.makeBinPath [ winetricks zenity ]}"
];
checkInputs = [ pytest ];
checkPhase = "pytest";
meta = with stdenv.lib; {
description = "A simple wrapper for running Winetricks commands for Proton-enabled games";
homepage = https://github.com/Matoking/protontricks;

5
pkgs/top-level/all-packages.nix
View file

@ -23399,9 +23399,12 @@ in
};
protontricks = callPackage ../tools/package-management/protontricks {
inherit (python3Packages) buildPythonApplication vdf;
inherit (python3Packages) buildPythonApplication pytest setuptools_scm vdf;
inherit (gnome3) zenity;
wine = wineWowPackages.minimal;
winetricks = winetricks.override {
wine = wineWowPackages.minimal;
};
};
stepmania = callPackage ../games/stepmania {