From dddcd10ecce21237f8b7f8abf6acd0938bff095e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 11 Jan 2018 18:35:09 +0100 Subject: Don't set 'config.xorg = {}' This makes memoization of Nixpkgs evaluation less effective, since some Nixpkgs invocations may have 'config = {}' while others may have 'config = { xorg = {}; }'. Instead set 'config = {}'. --- nixos/modules/services/x11/xserver.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 7acd621f53ab..f96d3c5afbac 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -548,7 +548,7 @@ in knownVideoDrivers; in optional (driver != null) ({ inherit name; modules = []; driverName = name; } // driver)); - nixpkgs.config.xorg = optionalAttrs (elem "vboxvideo" cfg.videoDrivers) { abiCompat = "1.18"; }; + nixpkgs.config = optionalAttrs (elem "vboxvideo" cfg.videoDrivers) { xorg.abiCompat = "1.18"; }; assertions = [ { assertion = config.security.polkit.enable; -- cgit 1.4.1