diff --git a/pkgs/development/libraries/libva/1.0.0.nix b/pkgs/development/libraries/libva/1.0.0.nix index 47464d225e81..04d621e29c84 100644 --- a/pkgs/development/libraries/libva/1.0.0.nix +++ b/pkgs/development/libraries/libva/1.0.0.nix @@ -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 = diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 729bc91c7743..7f6d55f3808c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cba774ac2b94..dec6117048fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };