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

fix(common/gpu/amd): use new rocmPackages

Browse source
This commit is contained in:
Bernardo Meurer 2023-10-10 16:23:31 -04:00 committed by mergify[bot]
parent 3d4a18fac8
commit fb6af288f6
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,16 +1,16 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
options.hardware.amdgpu.loadInInitrd = lib.mkEnableOption (lib.mdDoc options.hardware.amdgpu.loadInInitrd = lib.mkEnableOption (lib.mdDoc
"loading `amdgpu` kernelModule at stage 1. (Add `amdgpu` to `boot.initrd.kernelModules`)" "loading `amdgpu` kernelModule at stage 1. (Add `amdgpu` to `boot.initrd.kernelModules`)"
) // { ) // {
default = true; default = true;
}; };
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"
); );
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 rocmPackages.clr and rocmPackages.clr.icd)"
) // { ) // {
default = true; default = true;
}; };
@ -37,10 +37,10 @@
]; ];
}) })
(lib.mkIf config.hardware.amdgpu.opencl { (lib.mkIf config.hardware.amdgpu.opencl {
hardware.opengl.extraPackages = with pkgs; [ hardware.opengl.extraPackages =
rocm-opencl-icd if pkgs ? rocmPackages.clr
rocm-opencl-runtime then with pkgs.rocmPackages; [ clr clr.icd ]
]; else with pkgs; [ rocm-opencl-icd rocm-opencl-runtime ];
}) })
]; ];
} }