lutris: add multilib dependencies

Fix 32-bit Wine, possibly PCSX2.

1 files changed, 18 insertions, 15 deletions

diff --git a/pkgs/applications/misc/lutris/chrootenv.nix b/pkgs/applications/misc/lutris/chrootenv.nix
index a02639e1668c8..ab40dfc8131b8 100644
--- a/pkgs/applications/misc/lutris/chrootenv.nix
+++ b/pkgs/applications/misc/lutris/chrootenv.nix
@@ -9,7 +9,6 @@ let
   xorgDeps = pkgs: with pkgs.xorg; [
     libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp
     libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite
-    xrandr
   ];
 
 in buildFHSUserEnv {
@@ -20,15 +19,6 @@ in buildFHSUserEnv {
   targetPkgs = pkgs: with pkgs; [
     lutris-unwrapped
 
-    # Common
-    libsndfile libtheora libogg libvorbis libopus libGLU libpcap libpulseaudio
-    libao libusb libevdev libudev libgcrypt libxml2 libusb libpng libmpeg2 libv4l
-    libjpeg libxkbcommon libass libcdio libjack2 libsamplerate libzip libmad libaio
-    libcap libtiff libva libgphoto2 libxslt libtxc_dxtn libsndfile giflib zlib glib
-    alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils
-    readline gcc SDL SDL2 curl graphite2 gtk2 gtk3 udev ncurses wayland libglvnd
-    vulkan-loader xdg_utils sqlite
-
     # Adventure Game Studio
     allegro dumb
 
@@ -70,8 +60,6 @@ in buildFHSUserEnv {
     # Osmose
     qt4
 
-    # PCSX2 // TODO: "libgobject-2.0.so.0: wrong ELF class: ELFCLASS64"
-
     # PPSSPP
     glew snappy
 
@@ -93,16 +81,31 @@ in buildFHSUserEnv {
     bison flex
 
     # WINE
-    perl which p7zip gnused gnugrep psmisc cups lcms2 mpg123 cairo unixODBC
-    samba4 sane-backends openldap opencl-headers ocl-icd utillinux
+    xorg.xrandr perl which p7zip gnused gnugrep psmisc opencl-headers
 
     # ZDOOM
     soundfont-fluid bzip2 game-music-emu
   ] ++ qt5Deps pkgs
     ++ gnome3Deps pkgs
-    ++ xorgDeps pkgs
     ++ lib.optional steamSupport pkgs.steam;
 
+  multiPkgs = pkgs: with pkgs; [
+    # Common
+    libsndfile libtheora libogg libvorbis libopus libGLU libpcap libpulseaudio
+    libao libusb libevdev libudev libgcrypt libxml2 libusb libpng libmpeg2 libv4l
+    libjpeg libxkbcommon libass libcdio libjack2 libsamplerate libzip libmad libaio
+    libcap libtiff libva libgphoto2 libxslt libtxc_dxtn libsndfile giflib zlib glib
+    alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils
+    readline gcc SDL SDL2 curl graphite2 gtk2 gtk3 udev ncurses wayland libglvnd
+    vulkan-loader xdg_utils sqlite
+
+    # PCSX2 // TODO: "libgobject-2.0.so.0: wrong ELF class: ELFCLASS64"
+
+    # WINE
+    cups lcms2 mpg123 cairo unixODBC samba4 sane-backends openldap
+    ocl-icd utillinux
+  ] ++ xorgDeps pkgs;
+
   extraInstallCommands = ''
     mkdir -p $out/share
     ln -sf ${lutris-unwrapped}/share/applications $out/share