From 46b6619cb39e7e4d68c61aab724157ba27a8f94d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 2 Sep 2022 20:02:48 +0000 Subject: [PATCH] nixos/no-x-libs: use libva-minimal The primary difference between the standard and minimal variants of this package is that all the X libraries are removed from the minimal variant. I had to switch the order of the definitions in all-packages.nix to avoid an infinite recursion after the overlay was applied. --- nixos/modules/config/no-x-libs.nix | 1 + pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index a11bd8ad9086..96bec4f8d2eb 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -31,6 +31,7 @@ with lib; cairo = super.cairo.override { x11Support = false; }; dbus = super.dbus.override { x11Support = false; }; gobject-introspection = super.gobject-introspection.override { x11Support = false; }; + libva = super.libva-minimal; networkmanager-fortisslvpn = super.networkmanager-fortisslvpn.override { withGnome = false; }; networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; }; networkmanager-l2tp = super.networkmanager-l2tp.override { withGnome = false; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e934b4e32a80..7edd4ed6a686 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20160,8 +20160,8 @@ with pkgs; withUtils = false; }); - libva = callPackage ../development/libraries/libva { }; - libva-minimal = libva.override { minimal = true; }; + libva-minimal = callPackage ../development/libraries/libva { minimal = true; }; + libva = libva-minimal.override { minimal = false; }; libva-utils = callPackage ../development/libraries/libva/utils.nix { }; libva1 = callPackage ../development/libraries/libva/1.nix { };