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

libva1: full by default

Browse Source 
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:
Nikolay Amiantov 2018-03-26 14:10:35 +03:00
parent c7cf808ff8
commit 9258cea7e0
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/libva/1.0.0.nix
View File

@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, libX11, pkgconfig, libXext, libdrm, libXfixes, wayland, libffi { stdenv, lib, fetchurl, libX11, pkgconfig, libXext, libdrm, libXfixes, wayland, libffi
, libGL, libGL_driver , libGL, libGL_driver
, minimal ? true, libva , minimal ? false, libva1-minimal
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libdrm ] 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 # TODO: share libs between minimal and !minimal - perhaps just symlink them
configureFlags = configureFlags =

4
pkgs/top-level/aliases.nix
View File

@ -236,6 +236,10 @@ mapAliases (rec {
wineStable = winePackages.stable; wineStable = winePackages.stable;
wineUnstable = winePackages.unstable; wineUnstable = winePackages.unstable;
# added 2018-03-26
libva-full = libva;
libva1-full = libva1;
inherit (ocaml-ng) # added 2016-09-14 inherit (ocaml-ng) # added 2016-09-14
ocamlPackages_3_10_0 ocamlPackages_3_11_2 ocamlPackages_3_12_1 ocamlPackages_3_10_0 ocamlPackages_3_11_2 ocamlPackages_3_12_1
ocamlPackages_4_00_1 ocamlPackages_4_01_0 ocamlPackages_4_02 ocamlPackages_4_00_1 ocamlPackages_4_01_0 ocamlPackages_4_02

3
pkgs/top-level/all-packages.nix
View File

@ -10329,11 +10329,10 @@ with pkgs;
libva = callPackage ../development/libraries/libva { }; libva = callPackage ../development/libraries/libva { };
libva-minimal = libva.override { minimal = true; }; libva-minimal = libva.override { minimal = true; };
libva-full = libva;
libva-utils = callPackage ../development/libraries/libva-utils { }; libva-utils = callPackage ../development/libraries/libva-utils { };
libva1 = callPackage ../development/libraries/libva/1.0.0.nix { }; 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 { }; libvdpau = callPackage ../development/libraries/libvdpau { };