git.iko.soy/typeable/nixpkgs
on master help sign in
nixos/video: remove obsolete ati modules
commitced04640c7acb871b9b4c5694f51726effa14cbe authorJonathan Ringer <jonringer117@gmail.com> dateFri 21 May 2021, 08:53 (5 years ago) parenta420aca
3 files changed+1−43
nixos/modules/hardware/opengl.nix+1−2 nixos/modules/hardware/video/ati.nix−40 nixos/modules/module-list.nix−1
nixos/modules/hardware/opengl.nix+1−2
@@ -63,8 +63,7 @@ in
6363 description = ''
6464 On 64-bit systems, whether to support Direct Rendering for
6565 32-bit applications (such as Wine). This is currently only
66− supported for the <literal>nvidia</literal> and
67− <literal>ati_unfree</literal> drivers, as well as
66+ supported for the <literal>nvidia</literal> as well as
6867 <literal>Mesa</literal>.
6968 '';
7069 };
nixos/modules/hardware/video/ati.nixdeleted−40
@@ -1,40 +0,0 @@
1−# This module provides the proprietary ATI X11 / OpenGL drivers.
2−
3−{ config, lib, pkgs, ... }:
4−
5−with lib;
6−
7−let
8−
9− drivers = config.services.xserver.videoDrivers;
10−
11− enabled = elem "ati_unfree" drivers;
12−
13− ati_x11 = config.boot.kernelPackages.ati_drivers_x11;
14−
15−in
16−
17−{
18−
19− config = mkIf enabled {
20−
21− nixpkgs.config.xorg.abiCompat = "1.17";
22−
23− services.xserver.drivers = singleton
24− { name = "fglrx"; modules = [ ati_x11 ]; display = true; };
25−
26− hardware.opengl.package = ati_x11;
27− hardware.opengl.package32 = pkgs.pkgsi686Linux.linuxPackages.ati_drivers_x11.override { libsOnly = true; kernel = null; };
28− hardware.opengl.setLdLibraryPath = true;
29−
30− environment.systemPackages = [ ati_x11 ];
31−
32− boot.extraModulePackages = [ ati_x11 ];
33−
34− boot.blacklistedKernelModules = [ "radeon" ];
35−
36− environment.etc.ati.source = "${ati_x11}/etc/ati";
37−
38− };
39−
40−}
nixos/modules/module-list.nix−1
@@ -76,7 +76,6 @@
7676 ./hardware/wooting.nix
7777 ./hardware/uinput.nix
7878 ./hardware/video/amdgpu-pro.nix
79− ./hardware/video/ati.nix
8079 ./hardware/video/capture/mwprocapture.nix
8180 ./hardware/video/bumblebee.nix
8281 ./hardware/video/displaylink.nix