diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-11-12 20:29:14 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-11-12 20:29:14 +0100 |
commit | 9108b24253283cb776ff8c8520a349c3024b51ad (patch) | |
tree | dcc7acf7ff31c32ee71512e19fd90c2909d53c2f /nixos | |
parent | 6141939d6e0a77c84905efd560c03c3032164ef1 (diff) | |
download | nixpkgs-9108b24253283cb776ff8c8520a349c3024b51ad.tar nixpkgs-9108b24253283cb776ff8c8520a349c3024b51ad.tar.gz nixpkgs-9108b24253283cb776ff8c8520a349c3024b51ad.tar.bz2 nixpkgs-9108b24253283cb776ff8c8520a349c3024b51ad.tar.lz nixpkgs-9108b24253283cb776ff8c8520a349c3024b51ad.tar.xz nixpkgs-9108b24253283cb776ff8c8520a349c3024b51ad.tar.zst nixpkgs-9108b24253283cb776ff8c8520a349c3024b51ad.zip |
xorg: init xf86-video-vboxvideo at 1.0.0
... and switch to it by default in virtualbox guests
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/x11/xserver.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 070a0247343..34ae8c11a3f 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -13,7 +13,8 @@ let # Map video driver names to driver packages. FIXME: move into card-specific modules. knownVideoDrivers = { - virtualbox = { modules = [ kernelPackages.virtualboxGuestAdditions ]; driverName = "vboxvideo"; }; + # Alias so people can keep using "virtualbox" instead of "vboxvideo". + virtualbox = { modules = [ xorg.xf86videovboxvideo ]; driverName = "vboxvideo"; }; # modesetting does not have a xf86videomodesetting package as it is included in xorgserver modesetting = {}; @@ -564,8 +565,6 @@ in knownVideoDrivers; in optional (driver != null) ({ inherit name; modules = []; driverName = name; } // driver)); - nixpkgs.config = optionalAttrs (elem "vboxvideo" cfg.videoDrivers) { xorg.abiCompat = "1.18"; }; - assertions = [ { assertion = config.security.polkit.enable; message = "X11 requires Polkit to be enabled (‘security.polkit.enable = true’)."; |