From 5fb86ada5ac50e4504663dfa351cc0c58c98ce3a Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 28 Mar 2015 13:52:03 -0700 Subject: libva: Make mesa optional --- pkgs/development/libraries/libva/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'pkgs/development/libraries/libva') diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index dc648e1ea2e..44001496988 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, libX11, pkgconfig, libXext, mesa, libdrm, libXfixes, wayland, libffi }: +{ stdenv, fetchurl, libX11, pkgconfig, libXext, libdrm, libXfixes, wayland, libffi +, mesa ? null +}: stdenv.mkDerivation rec { name = "libva-1.5.1"; @@ -8,9 +10,9 @@ stdenv.mkDerivation rec { sha256 = "01d01mm9fgpwzqycmjjcj3in3vvzcibi3f64icsw2sksmmgb4495"; }; - buildInputs = [ libX11 libXext pkgconfig mesa libdrm libXfixes wayland libffi ]; + buildInputs = [ libX11 libXext pkgconfig libdrm libXfixes wayland libffi mesa ]; - configureFlags = [ "--enable-glx" ]; + configureFlags = stdenv.lib.optional (mesa != null) "--enable-glx"; meta = with stdenv.lib; { homepage = http://www.freedesktop.org/wiki/Software/vaapi; -- cgit 1.4.1