@@ -9,7 +9,6 @@ let
99 xorgDeps = pkgs: with pkgs.xorg; [
1010 libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp
1111 libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite
12− xrandr
1312 ];
1413
1514in buildFHSUserEnv {
@@ -20,15 +19,6 @@ in buildFHSUserEnv {
2019 targetPkgs = pkgs: with pkgs; [
2120 lutris-unwrapped
2221
23− # Common
24− libsndfile libtheora libogg libvorbis libopus libGLU libpcap libpulseaudio
25− libao libusb libevdev libudev libgcrypt libxml2 libusb libpng libmpeg2 libv4l
26− libjpeg libxkbcommon libass libcdio libjack2 libsamplerate libzip libmad libaio
27− libcap libtiff libva libgphoto2 libxslt libtxc_dxtn libsndfile giflib zlib glib
28− alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils
29− readline gcc SDL SDL2 curl graphite2 gtk2 gtk3 udev ncurses wayland libglvnd
30− vulkan-loader xdg_utils sqlite
31−
3222 # Adventure Game Studio
3323 allegro dumb
3424
@@ -70,8 +60,6 @@ in buildFHSUserEnv {
7060 # Osmose
7161 qt4
7262
73− # PCSX2 // TODO: "libgobject-2.0.so.0: wrong ELF class: ELFCLASS64"
74−
7563 # PPSSPP
7664 glew snappy
7765
@@ -93,16 +81,31 @@ in buildFHSUserEnv {
9381 bison flex
9482
9583 # WINE
96− perl which p7zip gnused gnugrep psmisc cups lcms2 mpg123 cairo unixODBC
97− samba4 sane-backends openldap opencl-headers ocl-icd utillinux
84+ xorg.xrandr perl which p7zip gnused gnugrep psmisc opencl-headers
9885
9986 # ZDOOM
10087 soundfont-fluid bzip2 game-music-emu
10188 ] ++ qt5Deps pkgs
10289 ++ gnome3Deps pkgs
103− ++ xorgDeps pkgs
10490 ++ lib.optional steamSupport pkgs.steam;
10591
92+ multiPkgs = pkgs: with pkgs; [
93+ # Common
94+ libsndfile libtheora libogg libvorbis libopus libGLU libpcap libpulseaudio
95+ libao libusb libevdev libudev libgcrypt libxml2 libusb libpng libmpeg2 libv4l
96+ libjpeg libxkbcommon libass libcdio libjack2 libsamplerate libzip libmad libaio
97+ libcap libtiff libva libgphoto2 libxslt libtxc_dxtn libsndfile giflib zlib glib
98+ alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils
99+ readline gcc SDL SDL2 curl graphite2 gtk2 gtk3 udev ncurses wayland libglvnd
100+ vulkan-loader xdg_utils sqlite
101+
102+ # PCSX2 // TODO: "libgobject-2.0.so.0: wrong ELF class: ELFCLASS64"
103+
104+ # WINE
105+ cups lcms2 mpg123 cairo unixODBC samba4 sane-backends openldap
106+ ocl-icd utillinux
107+ ] ++ xorgDeps pkgs;
108+
106109 extraInstallCommands = ''
107110 mkdir -p $out/share
108111 ln -sf ${lutris-unwrapped}/share/applications $out/share