diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2022-12-22 03:12:35 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-22 03:12:35 +0100 |
commit | dd4405bc8c01118e92feeeb3638f73c931fa956a (patch) | |
tree | fca1c5fb92411d35cfe8221bf1ea5133515b7cd3 /pkgs/applications/misc | |
parent | 90cf235d3bba3b1fc3f7ebb15164909f86e3a74c (diff) | |
parent | 697f738354e7958303cb0490a27f1562ea112068 (diff) |
Merge pull request #206474 from SuperSandro2000/lutris-
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/lutris/default.nix | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index f8836f2802c37..c67ec4cc2737f 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -48,6 +48,7 @@ , fluidsynth , xorgserver , xorg +, util-linux }: let @@ -68,22 +69,12 @@ let xorgserver xorg.setxkbmap xorg.xkbcomp + # bypass mount suid wrapper which does not work in fhsenv + util-linux ]; - - binPath = lib.makeBinPath requiredTools; - - gstDeps = with gst_all_1; [ - gst-libav - gst-plugins-bad - gst-plugins-base - gst-plugins-good - gst-plugins-ugly - gstreamer - ]; - in buildPythonApplication rec { - pname = "lutris-original"; + pname = "lutris-unwrapped"; version = "0.5.12"; src = fetchFromGitHub { @@ -104,7 +95,14 @@ buildPythonApplication rec { libnotify pango webkitgtk - ] ++ gstDeps; + ] ++ (with gst_all_1; [ + gst-libav + gst-plugins-bad + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gstreamer + ]); # See `install_requires` in https://github.com/lutris/lutris/blob/master/setup.py propagatedBuildInputs = [ @@ -125,19 +123,20 @@ buildPythonApplication rec { --replace "'libmagic.so.1'" "'${lib.getLib file}/lib/libmagic.so.1'" ''; - checkInputs = [ xvfb-run nose2 flake8 ] ++ requiredTools; - preCheck = "export HOME=$PWD"; checkPhase = '' runHook preCheck + + export HOME=$PWD xvfb-run -s '-screen 0 800x600x24' make test + runHook postCheck ''; # avoid double wrapping dontWrapGApps = true; makeWrapperArgs = [ - "--prefix PATH : ${binPath}" + "--prefix PATH : ${lib.makeBinPath requiredTools}" "\${gappsWrapperArgs[@]}" ]; # needed for glib-schemas to work correctly (will crash on dialogues otherwise) |