diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-21 08:53:25 -0700 |
|---|---|---|
| committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-05-21 16:16:48 -0700 |
| commit | ced04640c7acb871b9b4c5694f51726effa14cbe (patch) | |
| tree | cb8061ab1ad5791080e0e3e368bc10a74dca3570 /nixos | |
| parent | a420acab1e197c0c4a2f2b960f3bf1e6b8043caa (diff) | |
| download | nixpkgs-ced04640c7acb871b9b4c5694f51726effa14cbe.tar nixpkgs-ced04640c7acb871b9b4c5694f51726effa14cbe.tar.gz nixpkgs-ced04640c7acb871b9b4c5694f51726effa14cbe.tar.bz2 nixpkgs-ced04640c7acb871b9b4c5694f51726effa14cbe.tar.lz nixpkgs-ced04640c7acb871b9b4c5694f51726effa14cbe.tar.xz nixpkgs-ced04640c7acb871b9b4c5694f51726effa14cbe.tar.zst nixpkgs-ced04640c7acb871b9b4c5694f51726effa14cbe.zip | |
nixos/video: remove obsolete ati modules
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/hardware/opengl.nix | 3 | ||||
| -rw-r--r-- | nixos/modules/hardware/video/ati.nix | 40 | ||||
| -rw-r--r-- | nixos/modules/module-list.nix | 1 |
3 files changed, 1 insertions, 43 deletions
diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix index 061528f4b1b..a50b5d32c35 100644 --- a/nixos/modules/hardware/opengl.nix +++ b/nixos/modules/hardware/opengl.nix @@ -63,8 +63,7 @@ in description = '' On 64-bit systems, whether to support Direct Rendering for 32-bit applications (such as Wine). This is currently only - supported for the <literal>nvidia</literal> and - <literal>ati_unfree</literal> drivers, as well as + supported for the <literal>nvidia</literal> as well as <literal>Mesa</literal>. ''; }; diff --git a/nixos/modules/hardware/video/ati.nix b/nixos/modules/hardware/video/ati.nix deleted file mode 100644 index 06d3ea324d8..00000000000 --- a/nixos/modules/hardware/video/ati.nix +++ /dev/null @@ -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"; - - }; - -} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 4f93e1f361d..33b4d01ebff 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -76,7 +76,6 @@ ./hardware/wooting.nix ./hardware/uinput.nix ./hardware/video/amdgpu-pro.nix - ./hardware/video/ati.nix ./hardware/video/capture/mwprocapture.nix ./hardware/video/bumblebee.nix ./hardware/video/displaylink.nix |