summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-05-21 15:40:48 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-05-21 15:55:50 +0200
commit784503864bb1961f523f24fa6d6d745de6b01b0e (patch)
tree5df21dac1236dc3b32f848e55cdc656e35bfa0cc
parentca123bc274b23c5bc6de2578c137760d2bb26c5f (diff)
downloadnixpkgs-784503864bb1961f523f24fa6d6d745de6b01b0e.tar
nixpkgs-784503864bb1961f523f24fa6d6d745de6b01b0e.tar.gz
nixpkgs-784503864bb1961f523f24fa6d6d745de6b01b0e.tar.bz2
nixpkgs-784503864bb1961f523f24fa6d6d745de6b01b0e.tar.lz
nixpkgs-784503864bb1961f523f24fa6d6d745de6b01b0e.tar.xz
nixpkgs-784503864bb1961f523f24fa6d6d745de6b01b0e.tar.zst
nixpkgs-784503864bb1961f523f24fa6d6d745de6b01b0e.zip
Enable the xf86-video-modesetting driver
-rw-r--r--nixos/modules/services/x11/xserver.nix2
-rw-r--r--pkgs/top-level/release.nix1
2 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index dc3aa9d15cc..5f3e8003b45 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -169,7 +169,7 @@ in
       videoDrivers = mkOption {
         type = types.listOf types.str;
         # !!! We'd like "nv" here, but it segfaults the X server.
-        default = [ "ati" "cirrus" "intel" "vesa" "vmware" ];
+        default = [ "ati" "cirrus" "intel" "vesa" "vmware" "modesetting" ];
         example = [ "vesa" ];
         description = ''
           The names of the video drivers the configuration
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index fd990ebf17e..ce01b257741 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -422,6 +422,7 @@ let
         xf86videonv = linux;
         xf86videovesa = linux;
         xf86videovmware = linux;
+        xf86videomodesetting = linux;
         xfs = linux;
         xinput = linux;
         xkbcomp = linux;