aires/nixos-hardware
aires/nixos-hardware
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge #558

Browse source 
558: amdlvk cleanup r=Mic92 a=SuperSamus



Co-authored-by: Martino Fontana <tinozzo123@tutanota.com>
This commit is contained in:
bors[bot] 2023-02-18 05:50:27 +00:00 committed by GitHub
parent 44ae00e02e b4bf2550b3
commit 00d1c8da9a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common/gpu/amd/default.nix
View file

@ -8,9 +8,7 @@
}; };
options.hardware.amdgpu.amdvlk = lib.mkEnableOption (lib.mdDoc options.hardware.amdgpu.amdvlk = lib.mkEnableOption (lib.mdDoc
"use amdvlk drivers instead mesa radv drivers" "use amdvlk drivers instead mesa radv drivers"
) // { );
default = true;
};
options.hardware.amdgpu.opencl = lib.mkEnableOption (lib.mdDoc options.hardware.amdgpu.opencl = lib.mkEnableOption (lib.mdDoc
"rocm opencl runtime (Install rocm-opencl-icd and rocm-opencl-runtime)" "rocm opencl runtime (Install rocm-opencl-icd and rocm-opencl-runtime)"
) // { ) // {
@ -31,16 +29,12 @@
}) })
(lib.mkIf config.hardware.amdgpu.amdvlk { (lib.mkIf config.hardware.amdgpu.amdvlk {
hardware.opengl.extraPackages = with pkgs; [ hardware.opengl.extraPackages = with pkgs; [
rocm-opencl-icd
rocm-opencl-runtime
amdvlk amdvlk
]; ];
hardware.opengl.extraPackages32 = with pkgs; [ hardware.opengl.extraPackages32 = with pkgs; [
driversi686Linux.amdvlk driversi686Linux.amdvlk
]; ];
environment.variables.AMD_VULKAN_ICD = lib.mkDefault "RADV";
}) })
(lib.mkIf config.hardware.amdgpu.opencl { (lib.mkIf config.hardware.amdgpu.opencl {
hardware.opengl.extraPackages = with pkgs; [ hardware.opengl.extraPackages = with pkgs; [