diff options
author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2022-12-17 04:39:52 +0100 |
---|---|---|
committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2022-12-17 04:39:52 +0100 |
commit | 697f738354e7958303cb0490a27f1562ea112068 (patch) | |
tree | e6bd029f73e808057c59e880c5eaeb8bf3989ffd | |
parent | d0955299dee97dd5c252bbc5810801331397e6df (diff) |
lutris: cleanup, match attr and pname
-rw-r--r-- | pkgs/applications/misc/lutris/default.nix | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index 844379e911dce..c67ec4cc2737f 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -72,21 +72,9 @@ let # 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 { @@ -107,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 = [ @@ -128,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) |