public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libva: make libva-full the default

Browse Source 
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.
This commit is contained in:
Jan Malakhovski
2018-02-09 04:05:38 +00:00
committed by Nikolay Amiantov
parent 8f6f69cb0f
commit c7cf808ff8
5 changed files with 15 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/libva/default.nix
View File

@@ -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;