summary refs log tree commit diff
path: root/pkgs/development/libraries/libva
diff options
context:
space:
mode:
authorJan Malakhovski <oxij@oxij.org>2018-02-09 04:05:38 +0000
committerNikolay Amiantov <ab@fmap.me>2018-03-26 14:02:06 +0300
commitc7cf808ff856df7be8bb765034fd81f57b852717 (patch)
tree3b54b749698fc107bde10ebbc038d444273f0eb5 /pkgs/development/libraries/libva
parent8f6f69cb0fe8c39b441ddce1c56fad9dba18348b (diff)
downloadnixpkgs-c7cf808ff856df7be8bb765034fd81f57b852717.tar
nixpkgs-c7cf808ff856df7be8bb765034fd81f57b852717.tar.gz
nixpkgs-c7cf808ff856df7be8bb765034fd81f57b852717.tar.bz2
nixpkgs-c7cf808ff856df7be8bb765034fd81f57b852717.tar.lz
nixpkgs-c7cf808ff856df7be8bb765034fd81f57b852717.tar.xz
nixpkgs-c7cf808ff856df7be8bb765034fd81f57b852717.tar.zst
nixpkgs-c7cf808ff856df7be8bb765034fd81f57b852717.zip
libva: make `libva-full` the default
It seems that all uses of `libva` it in nixpkgs except `mesa` and itself actually
either will gain from using `libva-full` instead of `libva-minimal` by default
or simply won't care.
Diffstat (limited to 'pkgs/development/libraries/libva')
-rw-r--r--pkgs/development/libraries/libva/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
index b1108355106..0ba49da06cf 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/pkgs/development/libraries/libva/default.nix
@@ -1,11 +1,11 @@
 { stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig
 , libXext, libdrm, libXfixes, wayland, libffi, libX11
 , libGL, libGL_driver
-, minimal ? true, libva
+, minimal ? false, libva-minimal
 }:
 
 stdenv.mkDerivation rec {
-  name = "libva-${lib.optionalString (!minimal) "full-"}${version}";
+  name = "libva-${lib.optionalString minimal "minimal-"}${version}";
   version = "2.1.0";
 
   # update libva-utils and vaapiIntel as well
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
   buildInputs = [ libdrm ]
-    ++ lib.optionals (!minimal) [ libva libX11 libXext libXfixes wayland libffi libGL ];
+    ++ lib.optionals (!minimal) [ libva-minimal libX11 libXext libXfixes wayland libffi libGL ];
   # TODO: share libs between minimal and !minimal - perhaps just symlink them
 
   enableParallelBuilding = true;