Skip to content

Commit

Permalink
Don't set 'config.xorg = {}'
Browse files Browse the repository at this point in the history
This makes memoization of Nixpkgs evaluation less effective, since
some Nixpkgs invocations may have 'config = {}' while others may have
'config = { xorg = {}; }'.

Instead set 'config = {}'.
  • Loading branch information
edolstra committed Jan 11, 2018
1 parent 856d9c2 commit dddcd10
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion nixos/modules/services/x11/xserver.nix
Expand Up @@ -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;
Expand Down

0 comments on commit dddcd10

Please sign in to comment.