From 9258cea7e0487174077a6951ee9bee39d7fd7572 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 26 Mar 2018 14:10:35 +0300
Subject: [PATCH] libva1: full by default

This follows similar changes for libva. Also move `libva-full` to aliases.nix
with an intent to deprecate it later.
---
 pkgs/development/libraries/libva/1.0.0.nix | 4 ++--
 pkgs/top-level/aliases.nix                 | 4 ++++
 pkgs/top-level/all-packages.nix            | 3 +--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libva/1.0.0.nix b/pkgs/development/libraries/libva/1.0.0.nix
index 47464d225e8..04d621e29c8 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 729bc91c774..7f6d55f3808 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 cba774ac2b9..dec6117048f 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 { };