summary refs log tree commit diff
path: root/pkgs/development/libraries/gstreamer
diff options
context:
space:
mode:
authorAlexander V. Nikolaev <avn@avnik.info>2018-02-24 15:12:44 +0200
committerAlexander V. Nikolaev <avn@avnik.info>2018-02-24 17:06:49 +0200
commit0acec7e984ff38b7a296a459ba4b539a3b719c1b (patch)
tree1d60ce67493ab87f80acb127f4e26a11a0324c28 /pkgs/development/libraries/gstreamer
parent1bc1909e5b89ec8d0e4ecadcbb5c66de0cb4fb5a (diff)
downloadnixlib-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar
nixlib-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar.gz
nixlib-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar.bz2
nixlib-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar.lz
nixlib-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar.xz
nixlib-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar.zst
nixlib-0acec7e984ff38b7a296a459ba4b539a3b719c1b.zip
treewide: transition mesa to libGLU_combined
Diffstat (limited to 'pkgs/development/libraries/gstreamer')
-rw-r--r--pkgs/development/libraries/gstreamer/bad/default.nix4
-rw-r--r--pkgs/development/libraries/gstreamer/vaapi/default.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index c033140d8dc3..3a115bbaf2c4 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -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
diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix
index 2033c07d9527..8351cfd65b1e 100644
--- a/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -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 = "