libva: build a lighter version by default

Mesa, X etc. are not very light dependencies.
This will also allow us to break the cycle with mesa.
This commit is contained in:
Vladimír Čunát
2015-10-28 14:15:44 +01:00
parent 1d921ad3a7
commit 17b86fef1e
5 changed files with 30 additions and 14 deletions

View File

@@ -1,4 +1,4 @@
{ callPackage }:
{ callPackage, libva-full }:
rec {
gstreamer = callPackage ./core { };
@@ -17,5 +17,8 @@ rec {
gst-editing-services = callPackage ./ges { inherit gnonlin; };
gst-vaapi = callPackage ./vaapi { inherit gst-plugins-base gstreamer gst-plugins-bad; };
gst-vaapi = callPackage ./vaapi {
inherit gst-plugins-base gstreamer gst-plugins-bad;
libva = libva-full; # looks also for libva-{x11,wayland}
};
}

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gst-plugins-base, bzip2, libva
{ stdenv, fetchurl, pkgconfig, gst-plugins-base, bzip2, libva, wayland
, libdrm, udev, xorg, mesa, yasm, gstreamer, gst-plugins-bad, nasm
, libvpx
}:
@@ -14,8 +14,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = with stdenv.lib; [ pkgconfig bzip2 ];
buildInputs = with stdenv.lib; [ gstreamer gst-plugins-base gst-plugins-bad libva libdrm udev
xorg.libX11 xorg.libXext xorg.libXv xorg.libXrandr xorg.libSM xorg.libICE mesa nasm libvpx ];
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
];
preConfigure = "
export GST_PLUGIN_PATH_1_0=$out/lib/gstreamer-1.0