diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-29 12:58:54 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-29 14:42:36 +0200 |
commit | 3fe96bcca168b8b3ca9b9cb56f2568c338b0936d (patch) | |
tree | 17d9cf57b9abcf2d6256e6550c0028861ef08ec9 /nixos/modules/installer | |
parent | e6b5c0121f2cdaaf1e63b16c74337bb87aae42b2 (diff) | |
download | nixlib-3fe96bcca168b8b3ca9b9cb56f2568c338b0936d.tar nixlib-3fe96bcca168b8b3ca9b9cb56f2568c338b0936d.tar.gz nixlib-3fe96bcca168b8b3ca9b9cb56f2568c338b0936d.tar.bz2 nixlib-3fe96bcca168b8b3ca9b9cb56f2568c338b0936d.tar.lz nixlib-3fe96bcca168b8b3ca9b9cb56f2568c338b0936d.tar.xz nixlib-3fe96bcca168b8b3ca9b9cb56f2568c338b0936d.tar.zst nixlib-3fe96bcca168b8b3ca9b9cb56f2568c338b0936d.zip |
Rename hardware.opengl.videoDrivers back to services.xserver.videoDrivers
Fixes #2379. The new name was a misnomer because the values really are X11 video drivers (e.g. ‘cirrus’ or ‘nvidia’), not OpenGL implementations. That it's also used to set an OpenGL implementation for kmscon is just confusing overloading.
Diffstat (limited to 'nixos/modules/installer')
-rw-r--r-- | nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix | 3 | ||||
-rw-r--r-- | nixos/modules/installer/tools/nixos-generate-config.pl | 2 | ||||
-rw-r--r-- | nixos/modules/installer/virtualbox-demo.nix | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix index 1008bd5d3d0d..3626308bff80 100644 --- a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix +++ b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix @@ -138,7 +138,8 @@ in }; # Setting vesa, we don't get the nvidia driver, which can't work in arm. - hardware.opengl.videoDrivers = [ "vesa" ]; + services.xserver.videoDrivers = [ "vesa" ]; + services.nixosManual.enable = false; # Include the firmware for various wireless cards. diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index da1d26882772..89f112cc6bf0 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -165,7 +165,7 @@ foreach my $path (glob "/sys/bus/pci/devices/*") { pciCheck $path; } -push @attrs, "hardware.opengl.videoDrivers = [ \"$videoDriver\" ];" if $videoDriver; +push @attrs, "services.xserver.videoDrivers = [ \"$videoDriver\" ];" if $videoDriver; # Idem for USB devices. diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix index 0a52cbea2897..f68f8dc40aa8 100644 --- a/nixos/modules/installer/virtualbox-demo.nix +++ b/nixos/modules/installer/virtualbox-demo.nix @@ -15,5 +15,5 @@ with lib; # Add some more video drivers to give X11 a shot at working in # VMware and QEMU. - hardware.opengl.videoDrivers = mkOverride 40 [ "virtualbox" "vmware" "cirrus" "vesa" ]; + services.xserver.videoDrivers = mkOverride 40 [ "virtualbox" "vmware" "cirrus" "vesa" ]; } |