summary refs log tree commit diff
path: root/nixos/modules/module-list.nix
diff options
context:
space:
mode:
authorTomasz Kontusz <tomasz.kontusz@gmail.com>2014-02-08 19:47:51 +0100
committerBjørn Forsman <bjorn.forsman@gmail.com>2014-02-09 15:09:41 +0100
commitfe38031168620d0bc30c0b79f464f3c04c99f9d1 (patch)
tree6f6b7920d8248864465760eaaa8ef71c977fbf33 /nixos/modules/module-list.nix
parent48851fa749d634d68eaaa0dcd6c4041615b6c0f0 (diff)
downloadnixlib-fe38031168620d0bc30c0b79f464f3c04c99f9d1.tar
nixlib-fe38031168620d0bc30c0b79f464f3c04c99f9d1.tar.gz
nixlib-fe38031168620d0bc30c0b79f464f3c04c99f9d1.tar.bz2
nixlib-fe38031168620d0bc30c0b79f464f3c04c99f9d1.tar.lz
nixlib-fe38031168620d0bc30c0b79f464f3c04c99f9d1.tar.xz
nixlib-fe38031168620d0bc30c0b79f464f3c04c99f9d1.tar.zst
nixlib-fe38031168620d0bc30c0b79f464f3c04c99f9d1.zip
Upgrade bumblebee and add nixos module
 * Bump bumblebee to 3.2.1
 * Remove config.patch - options it added can be passed to ./configure now
 * Remove the provided xorg.conf
   Provided xorg.conf was causing problems for some users,
   and Bumblebee provides its own default configuration anyway.
 * Make secondary X11 log to /var/log/X.bumblebee.log
 * Add a module for bumblebee
Diffstat (limited to 'nixos/modules/module-list.nix')
-rw-r--r--nixos/modules/module-list.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 5d52f71c9ffb..c66cccb3975a 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -31,6 +31,7 @@
   ./hardware/network/rtl8192c.nix
   ./hardware/opengl.nix
   ./hardware/pcmcia.nix
+  ./hardware/video/bumblebee.nix
   ./installer/tools/nixos-checkout.nix
   ./installer/tools/tools.nix
   ./misc/assertions.nix