diff --git a/pkgs/applications/misc/lutris/chrootenv.nix b/pkgs/applications/misc/lutris/chrootenv.nix index b83b01a22d5..a02639e1668 100644 --- a/pkgs/applications/misc/lutris/chrootenv.nix +++ b/pkgs/applications/misc/lutris/chrootenv.nix @@ -1,6 +1,4 @@ -{ buildFHSUserEnv, lutris-unwrapped -, optimusSupport ? false -, nvidiaSmiSupport ? false +{ lib, buildFHSUserEnv, lutris-unwrapped , steamSupport ? true }: @@ -14,17 +12,13 @@ let xrandr ]; - lutris_ = lutris-unwrapped.override { - inherit optimusSupport nvidiaSmiSupport steamSupport; - }; - in buildFHSUserEnv { name = "lutris"; runScript = "lutris"; targetPkgs = pkgs: with pkgs; [ - lutris_ + lutris-unwrapped # Common libsndfile libtheora libogg libvorbis libopus libGLU libpcap libpulseaudio @@ -106,11 +100,12 @@ in buildFHSUserEnv { soundfont-fluid bzip2 game-music-emu ] ++ qt5Deps pkgs ++ gnome3Deps pkgs - ++ xorgDeps pkgs; + ++ xorgDeps pkgs + ++ lib.optional steamSupport pkgs.steam; extraInstallCommands = '' mkdir -p $out/share - ln -sf ${lutris_}/share/applications $out/share - ln -sf ${lutris_}/share/icons $out/share + ln -sf ${lutris-unwrapped}/share/applications $out/share + ln -sf ${lutris-unwrapped}/share/icons $out/share ''; } diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index 3315ad4ccf8..0f2274ad259 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -3,15 +3,12 @@ , gdk_pixbuf, atk, webkitgtk, gst_all_1 , evdev, pyyaml, pygobject3, requests, pillow , xrandr, pciutils, psmisc, glxinfo, vulkan-tools, xboxdrv, pulseaudio, p7zip, xgamma -, libstrangle, wine, fluidsynth -, optimusSupport ? false, primus, bumblebee -, nvidiaSmiSupport ? false, nvidia_x11 -, steamSupport ? true, steam +, libstrangle, wine, fluidsynth, xorgserver }: let # See lutris/util/linux.py - binPath = lib.makeBinPath ([ + binPath = lib.makeBinPath [ xrandr pciutils psmisc @@ -24,9 +21,8 @@ let libstrangle wine fluidsynth - ] ++ lib.optionals optimusSupport [ primus bumblebee ] - ++ lib.optional nvidiaSmiSupport nvidia_x11 - ++ lib.optional steamSupport steam); + xorgserver + ]; gstDeps = with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1c6b3a0fc9..a31ac26df23 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19011,7 +19011,6 @@ in lutris-unwrapped = python3.pkgs.callPackage ../applications/misc/lutris { inherit (gnome3) gnome-desktop libgnome-keyring webkitgtk; - nvidia_x11 = linuxPackages.nvidia_x11; wine = wineWowPackages.staging; }; lutris = callPackage ../applications/misc/lutris/chrootenv.nix { };