diff options
| author | adisbladis <adisbladis@gmail.com> | 2020-05-23 22:38:16 +0100 |
|---|---|---|
| committer | adisbladis <adisbladis@gmail.com> | 2020-06-11 18:49:29 +0200 |
| commit | 1a5dafcd5bebd2ad915876333b0ba94680148db7 (patch) | |
| tree | ba2f61b6c7c27980804daba371dfbb2ad9c22aea /nixos | |
| parent | 9de29f6dd7aa88ab4ea7878f463aa21ce129dc70 (diff) | |
| download | nixlib-1a5dafcd5bebd2ad915876333b0ba94680148db7.tar nixlib-1a5dafcd5bebd2ad915876333b0ba94680148db7.tar.gz nixlib-1a5dafcd5bebd2ad915876333b0ba94680148db7.tar.bz2 nixlib-1a5dafcd5bebd2ad915876333b0ba94680148db7.tar.lz nixlib-1a5dafcd5bebd2ad915876333b0ba94680148db7.tar.xz nixlib-1a5dafcd5bebd2ad915876333b0ba94680148db7.tar.zst nixlib-1a5dafcd5bebd2ad915876333b0ba94680148db7.zip | |
services.x11.videoDrivers: Don't include vmware driver by default
A better option for vmware guests is to set `virtualisation.vmware.guest.enable`.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2009.xml | 6 | ||||
| -rw-r--r-- | nixos/modules/services/x11/xserver.nix | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 40316b980f3b..be7f176614c9 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -178,6 +178,12 @@ services.mysql.initialScript = pkgs.writeText "mariadb-init.sql" '' </listitem> <listitem> <para> + <literal>vmware</literal> has been removed from the <literal>services.x11.videoDrivers</literal> defaults. + For VMWare guests set <literal>virtualisation.vmware.guest.enable</literal> to <literal>true</literal> which will include the appropriate drivers. + </para> + </listitem> + <listitem> + <para> The initrd SSH support now uses OpenSSH rather than Dropbear to allow the use of Ed25519 keys and other OpenSSH-specific functionality. Host keys must now be in the OpenSSH format, and at diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 6aec1c0753a2..400173745d3f 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -246,7 +246,7 @@ in videoDrivers = mkOption { type = types.listOf types.str; # !!! We'd like "nv" here, but it segfaults the X server. - default = [ "radeon" "cirrus" "vesa" "vmware" "modesetting" ]; + default = [ "radeon" "cirrus" "vesa" "modesetting" ]; example = [ "ati_unfree" "amdgpu" "amdgpu-pro" "nv" "nvidia" "nvidiaLegacy390" "nvidiaLegacy340" "nvidiaLegacy304" |