Change:
<!-- Note that these are hard requirements --<!-- You can use the "Go to file" functionality on github to find the package Then you can go to the history for this package Find the latest "packagename: oldversion -newversion" commit The "newversion" is the the current version of the package --- <!-- Type the name of your package and try to find an open pull request for the package If you find an open pull request, you can review it! There's a high chance that you'll have the new version right away while helping the community! --- name: lutris-unwrapped <!-- The current version can be found easily with the same process than above for checking the master branch If an open PR is present for the package, take this version as the current one and link to the PR --current version: 0.5.8.4 desired version: 0.5.9 <!-- Search your package here: If no maintainer is listed for your package, tag the person that last updated the package --maintainers: Please tag this issue in your PR.

Discussion:
, webkitgtk , wrapGAppsHook <ins> # check inputs , xvfb-run , nose , flake8 </ins> # python dependencies , dbus-python , distro

let # See lutris/util/linux.py <del> binPath = lib.makeBinPath [ </del> <ins> requiredTools = [ </ins> xrandr pciutils psmisc

xorg.xkbcomp ]; <ins> binPath = lib.makeBinPath requiredTools; </ins> gstDeps = with gst_all_1; [ gst-libav gst-plugins-bad

in buildPythonApplication rec { pname = "lutris-original"; <del> version = "0.5.8.4"; </del> <ins> version = "0.5.9.1"; </ins> src = fetchFromGitHub { owner = "lutris"; repo = "lutris"; rev = "v${version}"; <del> sha256 = "sha256-5ivXIgDyM9PRvuUhPFPgziXDvggcL+p65kI2yOaiS1M="; </del> <ins> sha256 = "sha256-ykPJneCKbFKv0x/EDo9PkRb1LkMeFeYzTDmvE3ShNe0="; </ins> }; nativeBuildInputs = [ wrapGAppsHook ];

python_magic ]; <ins> checkInputs = [ xvfb-run nose flake8 ] ++ requiredTools; preCheck = "export HOME=$PWD"; checkPhase = '' runHook preCheck xvfb-run -s '-screen 0 800x600x24' make test runHook postCheck ''; # unhardcodes xrandr and fixes nosetests # upstream in progress: https://github.com/lutris/lutris/pull/3754 patches = [ ./fixes.patch ]; </ins> # avoid double wrapping dontWrapGApps = true; makeWrapperArgs = [

# see https://github.com/NixOS/nixpkgs/issues/56943 strictDeps = false; <del> preCheck = "export HOME=$PWD"; </del> meta = with lib; { homepage = "https://lutris.net"; description = "Open Source gaming platform for GNU/Linux";

<ins> diff --git a/Makefile b/Makefile index 821a9500..75affa77 100644 --- a/Makefile +++ b/Makefile @@ -25,12 +25,12 @@ release: build-source upload upload-ppa test: rm tests/fixtures/pga.db -f -	nosetests3 +	nosetests cover: rm tests/fixtures/pga.db -f rm tests/coverage/ -rf -	nosetests3 --with-coverage --cover-package=lutris --cover-html --cover-html-dir=tests/coverage +	nosetests --with-coverage --cover-package=lutris --cover-html --cover-html-dir=tests/coverage pgp-renew: osc signkey --extend home:strycore diff --git a/lutris/util/graphics/xrandr.py b/lutris/util/graphics/xrandr.py index f788c94c..5544dbe9 100644 --- a/lutris/util/graphics/xrandr.py +++ b/lutris/util/graphics/xrandr.py @@ -5,6 +5,7 @@ from collections import namedtuple from lutris.util.log import logger from lutris.util.system import read_process_output +from lutris.util.linux import LINUX_SYSTEM Output = namedtuple("Output", ("name", "mode", "position", "rotation", "primary", "rate")) @@ -12,7 +13,7 @@ Output = namedtuple("Output", ("name", "mode", "position", "rotation", "primary" def _get_vidmodes(): """Return video modes from XrandR""" logger.debug("Retrieving video modes from XrandR") -    return read_process_output(["xrandr"]).split("n") +    return read_process_output([LINUX_SYSTEM.get("xrandr")]).split("n") def get_outputs():  # pylint: disable=too-many-locals @@ -76,7 +77,7 @@ def turn_off_except(display): for output in get_outputs(): if output.name != display: logger.info("Turning off %s", output[0]) -            subprocess.Popen(["xrandr", "--output", output.name, "--off"]) +            subprocess.Popen([LINUX_SYSTEM.get("xrandr"), "--output", output.name, "--off"]) def get_resolutions(): @@ -111,7 +112,7 @@ def change_resolution(resolution): logger.warning("Resolution %s doesn't exist.", resolution) else: logger.info("Changing resolution to %s", resolution) -            subprocess.Popen(["xrandr", "-s", resolution]) +            subprocess.Popen([LINUX_SYSTEM.get("xrandr"), "-s", resolution]) else: for display in resolution: logger.debug("Switching to %s on %s", display.mode, display.name) @@ -128,7 +129,7 @@ def change_resolution(resolution): logger.info("Switching resolution of %s to %s", display.name, display.mode) subprocess.Popen( [ -                    "xrandr", +                    LINUX_SYSTEM.get("xrandr"), "--output", display.name, "--mode", </ins>