diff options
| author | Shea Levy <shea@shealevy.com> | 2014-01-05 07:13:19 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2014-01-05 07:13:19 -0500 |
| commit | 139f8949e6a5898aa8f245b49c18a6c523dce24e (patch) | |
| tree | 07eaae3112af64386c3dea40e27a15a85f798f76 /nixos | |
| parent | 010e63c69d4e240d01e319af392fbf6b03cf7490 (diff) | |
| parent | ac2035287fbec30d92165fd3839d1bf71b8edd47 (diff) | |
| download | nixlib-139f8949e6a5898aa8f245b49c18a6c523dce24e.tar nixlib-139f8949e6a5898aa8f245b49c18a6c523dce24e.tar.gz nixlib-139f8949e6a5898aa8f245b49c18a6c523dce24e.tar.bz2 nixlib-139f8949e6a5898aa8f245b49c18a6c523dce24e.tar.lz nixlib-139f8949e6a5898aa8f245b49c18a6c523dce24e.tar.xz nixlib-139f8949e6a5898aa8f245b49c18a6c523dce24e.tar.zst nixlib-139f8949e6a5898aa8f245b49c18a6c523dce24e.zip | |
Merge branch 'merge-kernel-builds' into upstream-master
This is a second attempt at unifying the generic and manual-config kernel builds (see #412 for the last time). The set of working kernel packages is a superset of those that work on master, and as the only objection last time was the size of the $dev closure and now both $out and $dev combined are 20M smaller than $out on master (see message for ac2035287fbec30d92165fd3839d1bf71b8edd47), this should be unobjectionable. Signed-off-by: Shea Levy <shea@shealevy.com>
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/x11/xserver.nix | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 0253c70f2dd4..7fd0ee34a991 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -16,7 +16,6 @@ let ati_unfree = { modules = [ kernelPackages.ati_drivers_x11 ]; driverName = "fglrx"; }; nouveau = { modules = [ pkgs.xf86_video_nouveau ]; }; nvidia = { modules = [ kernelPackages.nvidia_x11 ]; }; - nvidiaLegacy96 = { modules = [ kernelPackages.nvidia_x11_legacy96 ]; driverName = "nvidia"; }; nvidiaLegacy173 = { modules = [ kernelPackages.nvidia_x11_legacy173 ]; driverName = "nvidia"; }; nvidiaLegacy304 = { modules = [ kernelPackages.nvidia_x11_legacy304 ]; driverName = "nvidia"; }; unichrome = { modules = [ pkgs.xorgVideoUnichrome ]; }; @@ -443,7 +442,6 @@ in boot.extraModulePackages = optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11 ++ - optional (elem "nvidiaLegacy96" driverNames) kernelPackages.nvidia_x11_legacy96 ++ optional (elem "nvidiaLegacy173" driverNames) kernelPackages.nvidia_x11_legacy173 ++ optional (elem "nvidiaLegacy304" driverNames) kernelPackages.nvidia_x11_legacy304 ++ optional (elem "virtualbox" driverNames) kernelPackages.virtualboxGuestAdditions ++ @@ -497,7 +495,6 @@ in pkgs.xdg_utils ] ++ optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11 - ++ optional (elem "nvidiaLegacy96" driverNames) kernelPackages.nvidia_x11_legacy96 ++ optional (elem "nvidiaLegacy173" driverNames) kernelPackages.nvidia_x11_legacy173 ++ optional (elem "nvidiaLegacy304" driverNames) kernelPackages.nvidia_x11_legacy304 ++ optional (elem "virtualbox" driverNames) xorg.xrefresh @@ -521,8 +518,6 @@ in XORG_DRI_DRIVER_PATH = "/run/opengl-driver/lib/dri"; # !!! Depends on the driver selected at runtime. } // optionalAttrs (elem "nvidia" driverNames) { LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11}/lib"; - } // optionalAttrs (elem "nvidiaLegacy96" driverNames) { - LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11_legacy96}/lib"; } // optionalAttrs (elem "nvidiaLegacy173" driverNames) { LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11_legacy173}/lib"; } // optionalAttrs (elem "nvidiaLegacy304" driverNames) { @@ -544,8 +539,6 @@ in ${optionalString cfg.driSupport32Bit "ln -sf ${pkgs_i686.linuxPackages.nvidia_x11.override { libsOnly = true; kernelDev = null; } } /run/opengl-driver-32"} '' - else if elem "nvidiaLegacy96" driverNames then - "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 "nvidiaLegacy304" driverNames then |