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

lutris: fix build

Browse Source 
Drop unneeded pangox_compat – it was probably needed before gtkglext propagated it.

Also stop using aliases.
This commit is contained in:
Jan Tojnar 2019-12-19 00:53:42 +01:00
parent c324283e8c
commit dda27bb406
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@
let let
qt5Deps = pkgs: with pkgs.qt5; [ qtbase qtmultimedia ]; qt5Deps = pkgs: with pkgs.qt5; [ qtbase qtmultimedia ];
gnome3Deps = pkgs: with pkgs.gnome3; [ zenity gtksourceview gnome-desktop libgnome-keyring webkitgtk ]; gnome3Deps = pkgs: with pkgs; [ gnome3.zenity gtksourceview gnome3.gnome-desktop gnome3.libgnome-keyring webkitgtk ];
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
@ -23,7 +23,7 @@ in buildFHSUserEnv {
allegro dumb allegro dumb
# Desmume # Desmume
lua agg soundtouch openal desktop-file-utils pangox_compat atk lua agg soundtouch openal desktop-file-utils atk
# DGen // TODO: libarchive is broken # DGen // TODO: libarchive is broken
@ -92,7 +92,7 @@ in buildFHSUserEnv {
multiPkgs = pkgs: with pkgs; [ multiPkgs = pkgs: with pkgs; [
# Common # Common
libsndfile libtheora libogg libvorbis libopus libGLU libpcap libpulseaudio libsndfile libtheora libogg libvorbis libopus libGLU libpcap libpulseaudio
libao libusb libevdev libudev libgcrypt libxml2 libusb libpng libmpeg2 libv4l libao libusb libevdev udev libgcrypt libxml2 libusb libpng libmpeg2 libv4l
libjpeg libxkbcommon libass libcdio libjack2 libsamplerate libzip libmad libaio libjpeg libxkbcommon libass libcdio libjack2 libsamplerate libzip libmad libaio
libcap libtiff libva libgphoto2 libxslt libtxc_dxtn libsndfile giflib zlib glib libcap libtiff libva libgphoto2 libxslt libtxc_dxtn libsndfile giflib zlib glib
alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils

2
pkgs/top-level/all-packages.nix
View File

@ -19869,7 +19869,7 @@ in
luppp = callPackage ../applications/audio/luppp { }; luppp = callPackage ../applications/audio/luppp { };
lutris-unwrapped = python3.pkgs.callPackage ../applications/misc/lutris { lutris-unwrapped = python3.pkgs.callPackage ../applications/misc/lutris {
inherit (gnome3) gnome-desktop libgnome-keyring webkitgtk; inherit (gnome3) gnome-desktop libgnome-keyring;
wine = wineWowPackages.staging; wine = wineWowPackages.staging;
}; };
lutris = callPackage ../applications/misc/lutris/chrootenv.nix { }; lutris = callPackage ../applications/misc/lutris/chrootenv.nix { };