diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2018-01-11 18:35:09 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2018-01-11 19:31:05 +0100 |
| commit | dddcd10ecce21237f8b7f8abf6acd0938bff095e (patch) | |
| tree | 4ab4688940466c363145f2cb10793b85d084afaf | |
| parent | 856d9c2b49b983e0735f3ca3a455a9da13ae55d9 (diff) | |
| download | nixlib-dddcd10ecce21237f8b7f8abf6acd0938bff095e.tar nixlib-dddcd10ecce21237f8b7f8abf6acd0938bff095e.tar.gz nixlib-dddcd10ecce21237f8b7f8abf6acd0938bff095e.tar.bz2 nixlib-dddcd10ecce21237f8b7f8abf6acd0938bff095e.tar.lz nixlib-dddcd10ecce21237f8b7f8abf6acd0938bff095e.tar.xz nixlib-dddcd10ecce21237f8b7f8abf6acd0938bff095e.tar.zst nixlib-dddcd10ecce21237f8b7f8abf6acd0938bff095e.zip | |
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 = {}'.
| -rw-r--r-- | nixos/modules/services/x11/xserver.nix | 2 |
1 files changed, 1 insertions, 1 deletions
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; |