diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2020-02-05 09:30:18 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-05 09:30:18 +0100 |
commit | e94e5cd03f5b47053d58a402058afaf2ff704c21 (patch) | |
tree | 5fc6581ed482a6b4d585d8d53c3188e3d236dbb6 /pkgs/tools/package-management | |
parent | 87d4951a82e77405a2f87b8aea3e2adaf488de36 (diff) | |
parent | 28d361ae3c60a0888066636fdd1e56f1f7a427fa (diff) | |
download | nixlib-e94e5cd03f5b47053d58a402058afaf2ff704c21.tar nixlib-e94e5cd03f5b47053d58a402058afaf2ff704c21.tar.gz nixlib-e94e5cd03f5b47053d58a402058afaf2ff704c21.tar.bz2 nixlib-e94e5cd03f5b47053d58a402058afaf2ff704c21.tar.lz nixlib-e94e5cd03f5b47053d58a402058afaf2ff704c21.tar.xz nixlib-e94e5cd03f5b47053d58a402058afaf2ff704c21.tar.zst nixlib-e94e5cd03f5b47053d58a402058afaf2ff704c21.zip |
Merge pull request #78647 from MetaDark/protontricks
protontricks: 1.3.1 -> 1.4
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r-- | pkgs/tools/package-management/protontricks/default.nix | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix index c8413c56854f..2b7fbd28c7ef 100644 --- a/pkgs/tools/package-management/protontricks/default.nix +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -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; |