From d0955299dee97dd5c252bbc5810801331397e6df Mon Sep 17 00:00:00 2001
From: Sandro Jäckel <sandro.jaeckel@gmail.com>
Date: Sat, 17 Dec 2022 04:38:58 +0100
Subject: lutris: avoid mount suid wrapper error in fhsenv by using none suid
 binary

lutris only calls mount -v which does not require special priviliges.
---
 pkgs/applications/misc/lutris/default.nix | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'pkgs/applications/misc')

diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix
index f8836f2802c37..844379e911dce 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,6 +69,8 @@ let
     xorgserver
     xorg.setxkbmap
     xorg.xkbcomp
+    # bypass mount suid wrapper which does not work in fhsenv
+    util-linux
   ];
 
   binPath = lib.makeBinPath requiredTools;
-- 
cgit 1.4.1


From 697f738354e7958303cb0490a27f1562ea112068 Mon Sep 17 00:00:00 2001
From: Sandro Jäckel <sandro.jaeckel@gmail.com>
Date: Sat, 17 Dec 2022 04:39:52 +0100
Subject: lutris: cleanup, match attr and pname

---
 pkgs/applications/misc/lutris/default.nix | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

(limited to 'pkgs/applications/misc')

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)
-- 
cgit 1.4.1