mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-01 23:22:37 +00:00
libva1: full by default
This follows similar changes for libva. Also move `libva-full` to aliases.nix with an intent to deprecate it later.
This commit is contained in:
parent
c7cf808ff8
commit
9258cea7e0
@ -1,6 +1,6 @@
|
||||
{ stdenv, lib, fetchurl, libX11, pkgconfig, libXext, libdrm, libXfixes, wayland, libffi
|
||||
, libGL, libGL_driver
|
||||
, minimal ? true, libva
|
||||
, minimal ? false, libva1-minimal
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
buildInputs = [ libdrm ]
|
||||
++ lib.optionals (!minimal) [ libva libX11 libXext libXfixes wayland libffi libGL ];
|
||||
++ lib.optionals (!minimal) [ libva1-minimal libX11 libXext libXfixes wayland libffi libGL ];
|
||||
# TODO: share libs between minimal and !minimal - perhaps just symlink them
|
||||
|
||||
configureFlags =
|
||||
|
@ -236,6 +236,10 @@ mapAliases (rec {
|
||||
wineStable = winePackages.stable;
|
||||
wineUnstable = winePackages.unstable;
|
||||
|
||||
# added 2018-03-26
|
||||
libva-full = libva;
|
||||
libva1-full = libva1;
|
||||
|
||||
inherit (ocaml-ng) # added 2016-09-14
|
||||
ocamlPackages_3_10_0 ocamlPackages_3_11_2 ocamlPackages_3_12_1
|
||||
ocamlPackages_4_00_1 ocamlPackages_4_01_0 ocamlPackages_4_02
|
||||
|
@ -10329,11 +10329,10 @@ with pkgs;
|
||||
|
||||
libva = callPackage ../development/libraries/libva { };
|
||||
libva-minimal = libva.override { minimal = true; };
|
||||
libva-full = libva;
|
||||
libva-utils = callPackage ../development/libraries/libva-utils { };
|
||||
|
||||
libva1 = callPackage ../development/libraries/libva/1.0.0.nix { };
|
||||
libva1-full = libva1.override { minimal = false; };
|
||||
libva1-minimal = libva1.override { minimal = true; };
|
||||
|
||||
libvdpau = callPackage ../development/libraries/libvdpau { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user