summary refs log tree commit diff
path: root/pkgs/development/libraries/libva
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2015-10-28 14:15:44 +0100
committerVladimír Čunát <vcunat@gmail.com>2015-10-28 14:15:44 +0100
commit17b86fef1efb6c0939d1acee2078d2f24dffb8cb (patch)
tree8d8a29fad44af4fcf449a114782e823bbdde5c95 /pkgs/development/libraries/libva
parent1d921ad3a7dfd8b3edd2e8005acfe170a6d41603 (diff)
downloadnixpkgs-17b86fef1efb6c0939d1acee2078d2f24dffb8cb.tar
nixpkgs-17b86fef1efb6c0939d1acee2078d2f24dffb8cb.tar.gz
nixpkgs-17b86fef1efb6c0939d1acee2078d2f24dffb8cb.tar.bz2
nixpkgs-17b86fef1efb6c0939d1acee2078d2f24dffb8cb.tar.lz
nixpkgs-17b86fef1efb6c0939d1acee2078d2f24dffb8cb.tar.xz
nixpkgs-17b86fef1efb6c0939d1acee2078d2f24dffb8cb.tar.zst
nixpkgs-17b86fef1efb6c0939d1acee2078d2f24dffb8cb.zip
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.
Diffstat (limited to 'pkgs/development/libraries/libva')
-rw-r--r--pkgs/development/libraries/libva/default.nix13
1 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
index 12de07ced32..ff44b157eaf 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/pkgs/development/libraries/libva/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, libX11, pkgconfig, libXext, libdrm, libXfixes, wayland, libffi
-, mesa ? null
+, mesa_noglu
+, minimal ? true, libva
 }:
 
 stdenv.mkDerivation rec {
@@ -10,9 +11,15 @@ stdenv.mkDerivation rec {
     sha256 = "0bjfb5s8dk3lql843l91ffxzlq47isqks5sj19cxh7j3nhzw58kz";
   };
 
-  buildInputs = [ libX11 libXext pkgconfig libdrm libXfixes wayland libffi mesa ];
+  outputs = [ "dev" "out" "bin" ];
 
-  configureFlags = stdenv.lib.optional (mesa != null) "--enable-glx";
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ libdrm ]
+    ++ stdenv.lib.optionals (!minimal) [ libva libX11 libXext libXfixes wayland libffi mesa_noglu ];
+  # TODO: share libs between minimal and !minimal - perhaps just symlink them
+
+  #configureFlags = stdenv.lib.optional (mesa != null) "--enable-glx";
 
   meta = with stdenv.lib; {
     homepage = http://www.freedesktop.org/wiki/Software/vaapi;