diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-11-30 16:12:04 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-11-30 16:12:04 +0100 |
| commit | b1da38f5649e8d6d666ed8c8873e960ffbd14589 (patch) | |
| tree | f58b4c9acef8ea102bdfbfa39e33695f2b814ff6 /modules/services/x11/xserver.nix | |
| parent | 3c6e0fd594801617d77ce78e01d8b066aeb5982e (diff) | |
| parent | 7435db4f898233f9615b7818c07bbbcf30d44d63 (diff) | |
| download | nixlib-b1da38f5649e8d6d666ed8c8873e960ffbd14589.tar nixlib-b1da38f5649e8d6d666ed8c8873e960ffbd14589.tar.gz nixlib-b1da38f5649e8d6d666ed8c8873e960ffbd14589.tar.bz2 nixlib-b1da38f5649e8d6d666ed8c8873e960ffbd14589.tar.lz nixlib-b1da38f5649e8d6d666ed8c8873e960ffbd14589.tar.xz nixlib-b1da38f5649e8d6d666ed8c8873e960ffbd14589.tar.zst nixlib-b1da38f5649e8d6d666ed8c8873e960ffbd14589.zip | |
Merge remote-tracking branch 'origin/master' into systemd
Diffstat (limited to 'modules/services/x11/xserver.nix')
| -rw-r--r-- | modules/services/x11/xserver.nix | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix index 992911ca3c4b..1c5a3f75039b 100644 --- a/modules/services/x11/xserver.nix +++ b/modules/services/x11/xserver.nix @@ -343,7 +343,8 @@ in optional (elem "virtualbox" driverNames) kernelPackages.virtualboxGuestAdditions ++ optional (elem "ati_unfree" driverNames) kernelPackages.ati_drivers_x11; - environment.etc = optionals cfg.exportConfiguration + environment.etc = + (optionals cfg.exportConfiguration [ { source = "${configFile}"; target = "X11/xorg.conf"; } @@ -351,7 +352,15 @@ in { source = "${pkgs.xkeyboard_config}/etc/X11/xkb"; target = "X11/xkb"; } - ]; + ]) + ++ (optionals (elem "ati_unfree" driverNames) [ + + # according toiive on #ati you don't need the pcs, it is like registry... keeps old stuff to make your + # life harder ;) Still it seems to be required + { source = "${kernelPackages.ati_drivers_x11}/etc/ati"; + target = "ati"; + } + ]); environment.x11Packages = [ xorg.xorgserver @@ -417,6 +426,8 @@ in "ln -sf ${kernelPackages.nvidia_x11_legacy96} /run/opengl-driver" else if elem "nvidiaLegacy173" driverNames then "ln -sf ${kernelPackages.nvidia_x11_legacy173} /run/opengl-driver" + else if elem "ati_unfree" driverNames then + "ln -sf ${kernelPackages.ati_drivers_x11} /run/opengl-driver" else if cfg.driSupport then "ln -sf ${pkgs.mesa} /run/opengl-driver" else "" |