diff options
author | Jan Malakhovski <oxij@oxij.org> | 2018-02-09 04:05:38 +0000 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2018-03-26 14:02:06 +0300 |
commit | c7cf808ff856df7be8bb765034fd81f57b852717 (patch) | |
tree | 3b54b749698fc107bde10ebbc038d444273f0eb5 /pkgs/development/libraries | |
parent | 8f6f69cb0fe8c39b441ddce1c56fad9dba18348b (diff) | |
download | nixpkgs-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')
-rw-r--r-- | pkgs/development/libraries/gstreamer/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/libraries/libva/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index 76cffa89dbc..97f775e8e58 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -1,4 +1,4 @@ -{ callPackage, libva-full }: +{ callPackage }: rec { gstreamer = callPackage ./core { }; @@ -23,7 +23,6 @@ rec { gst-vaapi = callPackage ./vaapi { inherit gst-plugins-base gstreamer gst-plugins-bad; - libva = libva-full; # looks also for libva-{x11,wayland} }; gst-validate = callPackage ./validate { inherit gst-plugins-base; }; 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; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 07c966cbbfc..984c11d55b9 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch, lib , pkgconfig, intltool, autoreconfHook, substituteAll , file, expat, libdrm, xorg, wayland, wayland-protocols, openssl -, llvmPackages, libffi, libomxil-bellagio, libva +, llvmPackages, libffi, libomxil-bellagio, libva-minimal , libelf, libvdpau, valgrind-light, python2 , libglvnd , grsecEnabled ? false @@ -151,7 +151,7 @@ let self = stdenv.mkDerivation { glproto dri2proto dri3proto presentproto libX11 libXext libxcb libXt libXfixes libxshmfence libffi wayland wayland-protocols libvdpau libelf libXvMC - libomxil-bellagio libva libpthreadstubs openssl/*or another sha1 provider*/ + libomxil-bellagio libva-minimal libpthreadstubs openssl/*or another sha1 provider*/ valgrind-light python2 ]; |