nixos/video: remove obsolete ati modules
This commit is contained in:
parent
a420acab1e
commit
ced04640c7
|
@ -63,8 +63,7 @@ in
|
||||||
description = ''
|
description = ''
|
||||||
On 64-bit systems, whether to support Direct Rendering for
|
On 64-bit systems, whether to support Direct Rendering for
|
||||||
32-bit applications (such as Wine). This is currently only
|
32-bit applications (such as Wine). This is currently only
|
||||||
supported for the <literal>nvidia</literal> and
|
supported for the <literal>nvidia</literal> as well as
|
||||||
<literal>ati_unfree</literal> drivers, as well as
|
|
||||||
<literal>Mesa</literal>.
|
<literal>Mesa</literal>.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,40 +0,0 @@
|
||||||
# This module provides the proprietary ATI X11 / OpenGL drivers.
|
|
||||||
|
|
||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
with lib;
|
|
||||||
|
|
||||||
let
|
|
||||||
|
|
||||||
drivers = config.services.xserver.videoDrivers;
|
|
||||||
|
|
||||||
enabled = elem "ati_unfree" drivers;
|
|
||||||
|
|
||||||
ati_x11 = config.boot.kernelPackages.ati_drivers_x11;
|
|
||||||
|
|
||||||
in
|
|
||||||
|
|
||||||
{
|
|
||||||
|
|
||||||
config = mkIf enabled {
|
|
||||||
|
|
||||||
nixpkgs.config.xorg.abiCompat = "1.17";
|
|
||||||
|
|
||||||
services.xserver.drivers = singleton
|
|
||||||
{ name = "fglrx"; modules = [ ati_x11 ]; display = true; };
|
|
||||||
|
|
||||||
hardware.opengl.package = ati_x11;
|
|
||||||
hardware.opengl.package32 = pkgs.pkgsi686Linux.linuxPackages.ati_drivers_x11.override { libsOnly = true; kernel = null; };
|
|
||||||
hardware.opengl.setLdLibraryPath = true;
|
|
||||||
|
|
||||||
environment.systemPackages = [ ati_x11 ];
|
|
||||||
|
|
||||||
boot.extraModulePackages = [ ati_x11 ];
|
|
||||||
|
|
||||||
boot.blacklistedKernelModules = [ "radeon" ];
|
|
||||||
|
|
||||||
environment.etc.ati.source = "${ati_x11}/etc/ati";
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
|
|
@ -76,7 +76,6 @@
|
||||||
./hardware/wooting.nix
|
./hardware/wooting.nix
|
||||||
./hardware/uinput.nix
|
./hardware/uinput.nix
|
||||||
./hardware/video/amdgpu-pro.nix
|
./hardware/video/amdgpu-pro.nix
|
||||||
./hardware/video/ati.nix
|
|
||||||
./hardware/video/capture/mwprocapture.nix
|
./hardware/video/capture/mwprocapture.nix
|
||||||
./hardware/video/bumblebee.nix
|
./hardware/video/bumblebee.nix
|
||||||
./hardware/video/displaylink.nix
|
./hardware/video/displaylink.nix
|
||||||
|
|
Loading…
Reference in New Issue