public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1778 from pSub/rename-xserver-videoDrivers

Browse Source 
Renamed obsolete option services.xserver.videoDrivers to hardware.opengl.videoDrivers
This commit is contained in:
Domen Kožar 2014-02-18 23:38:05 +01:00
commit f39679e398
6 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/doc/manual/configuration.xml
View File

@ -1183,7 +1183,7 @@ driver from a set of X.org drivers (such as <literal>vesa</literal>
and <literal>intel</literal>). You can also specify a driver and <literal>intel</literal>). You can also specify a driver
manually, e.g. manually, e.g.
<programlisting> <programlisting>
services.xserver.videoDrivers = [ "r128" ]; hardware.opengl.videoDrivers = [ "r128" ];
</programlisting> </programlisting>
to enable X.org’s <literal>xf86-video-r128</literal> driver.</para> to enable X.org’s <literal>xf86-video-r128</literal> driver.</para>
@ -1226,7 +1226,7 @@ $ systemctl start display-manager.service
has better 3D performance than the X.org drivers. It is not enabled has better 3D performance than the X.org drivers. It is not enabled
by default because it’s not free software. You can enable it as follows: by default because it’s not free software. You can enable it as follows:
<programlisting> <programlisting>
services.xserver.videoDrivers = [ "nvidia" ]; hardware.opengl.videoDrivers = [ "nvidia" ];
</programlisting> </programlisting>
You may need to reboot after enabling this driver to prevent a clash You may need to reboot after enabling this driver to prevent a clash
with other kernel modules.</para> with other kernel modules.</para>

3
nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
View File

@ -138,8 +138,7 @@ in
}; };
# Setting vesa, we don't get the nvidia driver, which can't work in arm. # Setting vesa, we don't get the nvidia driver, which can't work in arm.
services.xserver.videoDriver = "vesa"; hardware.opengl.videoDrivers = [ "vesa" ];
services.xserver.videoDrivers = [];
services.nixosManual.enable = false; services.nixosManual.enable = false;
# Include the firmware for various wireless cards. # Include the firmware for various wireless cards.

2
nixos/modules/installer/tools/nixos-generate-config.pl
View File

@ -163,7 +163,7 @@ foreach my $path (glob "/sys/bus/pci/devices/*") {
pciCheck $path; pciCheck $path;
} }
push @attrs, "services.xserver.videoDrivers = [ \"$videoDriver\" ];" if $videoDriver; push @attrs, "hardware.opengl.videoDrivers = [ \"$videoDriver\" ];" if $videoDriver;
# Idem for USB devices. # Idem for USB devices.

2
nixos/modules/installer/virtualbox-demo.nix
View File

@ -15,5 +15,5 @@ with pkgs.lib;
# Add some more video drivers to give X11 a shot at working in # Add some more video drivers to give X11 a shot at working in
# VMware and QEMU. # VMware and QEMU.
services.xserver.videoDrivers = mkOverride 40 [ "virtualbox" "vmware" "cirrus" "vesa" ]; hardware.opengl.videoDrivers = mkOverride 40 [ "virtualbox" "vmware" "cirrus" "vesa" ];
} }

2
nixos/modules/services/x11/terminal-server.nix
View File

@ -27,7 +27,7 @@ in
config = { config = {
services.xserver.enable = true; services.xserver.enable = true;
services.xserver.videoDrivers = []; hardware.opengl.videoDrivers = [];
# Enable KDM. Any display manager will do as long as it supports XDMCP. # Enable KDM. Any display manager will do as long as it supports XDMCP.
services.xserver.displayManager.kdm.enable = true; services.xserver.displayManager.kdm.enable = true;

1
nixos/modules/virtualisation/qemu-vm.nix
View File

@ -386,7 +386,6 @@ in
# When building a regular system configuration, override whatever # When building a regular system configuration, override whatever
# video driver the host uses. # video driver the host uses.
services.xserver.videoDriver = mkVMOverride null;
hardware.opengl.videoDrivers = mkVMOverride [ "vesa" ]; hardware.opengl.videoDrivers = mkVMOverride [ "vesa" ];
services.xserver.defaultDepth = mkVMOverride 0; services.xserver.defaultDepth = mkVMOverride 0;
services.xserver.resolutions = mkVMOverride [ { x = 1024; y = 768; } ]; services.xserver.resolutions = mkVMOverride [ { x = 1024; y = 768; } ];