public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lutris: add multilib dependencies

Browse Source 
Fix 32-bit Wine, possibly PCSX2.
This commit is contained in:
Nikolay Amiantov 2019-07-22 14:36:43 +03:00
parent 5f4288d49d
commit b24841dd22
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkgs/applications/misc/lutris/chrootenv.nix
View File

@ -9,7 +9,6 @@ let
xorgDeps = pkgs: with pkgs.xorg; [ xorgDeps = pkgs: with pkgs.xorg; [
libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp
libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite
xrandr
]; ];
in buildFHSUserEnv { in buildFHSUserEnv {
@ -20,15 +19,6 @@ in buildFHSUserEnv {
targetPkgs = pkgs: with pkgs; [ targetPkgs = pkgs: with pkgs; [
lutris-unwrapped 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 # Adventure Game Studio
allegro dumb allegro dumb
@ -70,8 +60,6 @@ in buildFHSUserEnv {
# Osmose # Osmose
qt4 qt4
# PCSX2 // TODO: "libgobject-2.0.so.0: wrong ELF class: ELFCLASS64"
# PPSSPP # PPSSPP
glew snappy glew snappy
@ -93,16 +81,31 @@ in buildFHSUserEnv {
bison flex bison flex
# WINE # WINE
perl which p7zip gnused gnugrep psmisc cups lcms2 mpg123 cairo unixODBC xorg.xrandr perl which p7zip gnused gnugrep psmisc opencl-headers
samba4 sane-backends openldap opencl-headers ocl-icd utillinux
# ZDOOM # ZDOOM
soundfont-fluid bzip2 game-music-emu soundfont-fluid bzip2 game-music-emu
] ++ qt5Deps pkgs ] ++ qt5Deps pkgs
++ gnome3Deps pkgs ++ gnome3Deps pkgs
++ xorgDeps pkgs
++ lib.optional steamSupport pkgs.steam; ++ 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 = '' extraInstallCommands = ''
mkdir -p $out/share mkdir -p $out/share
ln -sf ${lutris-unwrapped}/share/applications $out/share ln -sf ${lutris-unwrapped}/share/applications $out/share