treewide: transition mesa to libGLU_combined

This commit is contained in:
Alexander V. Nikolaev
2018-02-24 17:06:49 +02:00
parent 1bc1909e5b
commit 0acec7e984
273 changed files with 572 additions and 572 deletions
@@ -6,7 +6,7 @@
, openjpeg, libopus, librsvg
, wildmidi, fluidsynth, libvdpau, wayland
, libwebp, xvidcore, gnutls, mjpegtools
, mesa, libintlOrEmpty, libgme
, libGLU_combined, libintlOrEmpty, libgme
, openssl, x265, libxml2
}:
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
libmodplug mpeg2dec mpg123
openjpeg libopus librsvg
fluidsynth libvdpau
libwebp xvidcore gnutls mesa
libwebp xvidcore gnutls libGLU_combined
mjpegtools libgme openssl x265 libxml2
]
++ libintlOrEmpty
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gst-plugins-base, bzip2, libva, wayland
, libdrm, udev, xorg, mesa, yasm, gstreamer, gst-plugins-bad, nasm
, libdrm, udev, xorg, libGLU_combined, yasm, gstreamer, gst-plugins-bad, nasm
, libvpx, python
}:
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gstreamer gst-plugins-base gst-plugins-bad libva wayland libdrm udev
xorg.libX11 xorg.libXext xorg.libXv xorg.libXrandr xorg.libSM
xorg.libICE mesa nasm libvpx python
xorg.libICE libGLU_combined nasm libvpx python
];
preConfigure = "