diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-12-19 00:53:42 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-19 00:58:19 +0100 |
| commit | dda27bb4068e8f6aa53a07227fc509d2fe5c1f02 (patch) | |
| tree | 4614d4411bd06ad16bda4fb120bd699ad320fe15 /pkgs | |
| parent | c324283e8c3180742b04c01254c175dccf15b520 (diff) | |
| download | nixpkgs-dda27bb4068e8f6aa53a07227fc509d2fe5c1f02.tar nixpkgs-dda27bb4068e8f6aa53a07227fc509d2fe5c1f02.tar.gz nixpkgs-dda27bb4068e8f6aa53a07227fc509d2fe5c1f02.tar.bz2 nixpkgs-dda27bb4068e8f6aa53a07227fc509d2fe5c1f02.tar.lz nixpkgs-dda27bb4068e8f6aa53a07227fc509d2fe5c1f02.tar.xz nixpkgs-dda27bb4068e8f6aa53a07227fc509d2fe5c1f02.tar.zst nixpkgs-dda27bb4068e8f6aa53a07227fc509d2fe5c1f02.zip | |
lutris: fix build
Drop unneeded pangox_compat – it was probably needed before gtkglext propagated it. Also stop using aliases.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/lutris/chrootenv.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/misc/lutris/chrootenv.nix b/pkgs/applications/misc/lutris/chrootenv.nix index 16bf65262cc..58492259b09 100644 --- a/pkgs/applications/misc/lutris/chrootenv.nix +++ b/pkgs/applications/misc/lutris/chrootenv.nix @@ -5,7 +5,7 @@ let 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; [ libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite @@ -23,7 +23,7 @@ in buildFHSUserEnv { allegro dumb # Desmume - lua agg soundtouch openal desktop-file-utils pangox_compat atk + lua agg soundtouch openal desktop-file-utils atk # DGen // TODO: libarchive is broken @@ -92,7 +92,7 @@ in buildFHSUserEnv { multiPkgs = pkgs: with pkgs; [ # Common 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 libcap libtiff libva libgphoto2 libxslt libtxc_dxtn libsndfile giflib zlib glib alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d71a039199c..38a561e66f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19869,7 +19869,7 @@ in luppp = callPackage ../applications/audio/luppp { }; lutris-unwrapped = python3.pkgs.callPackage ../applications/misc/lutris { - inherit (gnome3) gnome-desktop libgnome-keyring webkitgtk; + inherit (gnome3) gnome-desktop libgnome-keyring; wine = wineWowPackages.staging; }; lutris = callPackage ../applications/misc/lutris/chrootenv.nix { }; |