update flake

This commit is contained in:
Kopatz
2025-05-26 18:12:55 +02:00
parent 53ca6c19b3
commit 586a53e9e9
3 changed files with 65 additions and 94 deletions

View File

@@ -7,30 +7,6 @@ in {
};
config =
let
mesa-new = pkgs.mesa.overrideAttrs (old: {
src = pkgs.fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "mesa";
repo = "mesa";
rev = "93547d45ceb0a59f429f6029b339c044f8aaabaa";
hash = "sha256-u5Lksclv0+cMfO02Ilp6v/7UCoTdm5veIvf1uejWlgQ=";
};
patches = [
./opencl.patch
];
});
#mesa-new = pkgs.mesa-git.mesa.overrideAttrs (oldAttrs: {
# src = pkgs.fetchFromGitLab {
# domain = "gitlab.freedesktop.org";
# owner = "hakzsam";
# repo = "mesa";
# rev = "9238ae542f15e4566430a540817e15a8ec079a59";
# hash = "sha256-c/iV/V7m3GuatEuybaetHVIPm66/a6lC1wvV/GGtvnQ=";
# };
#});
in
lib.mkIf cfg.enable {
boot.kernelParams =
[ "amdgpu.ppfeaturemask=0xfff7ffff" "split_lock_detect=off" ];
@@ -38,8 +14,6 @@ in {
hardware.graphics = {
enable = true;
enable32Bit = true;
package = lib.mkForce mesa-new;
#extraPackages = with pkgs; [ mesa-git.amdvlk ];
extraPackages = lib.mkIf cfg.rocm.enable (with pkgs; [ rocmPackages.clr rocmPackages.clr.icd ]);
};
@@ -51,27 +25,28 @@ in {
nvtopPackages.amd
amdgpu_top
] ++ lib.optionals cfg.rocm.enable [
clinfo
rocmPackages.rocminfo
clinfo
rocmPackages.rocminfo
];
systemd.packages = with pkgs; [ lact ];
systemd.services.lactd.wantedBy = [ "multi-user.target" ];
#rocm
systemd.tmpfiles.rules =
let
rocmEnv = pkgs.symlinkJoin {
name = "rocm-combined";
paths = with pkgs.rocmPackages; [
rocblas
hipblas
clr
systemd = {
packages = with pkgs; [ lact ];
services.lactd.wantedBy = [ "multi-user.target" ];
#rocm
tmpfiles.rules =
let
rocmEnv = pkgs.symlinkJoin {
name = "rocm-combined";
paths = with pkgs.rocmPackages; [
rocblas
hipblas
clr
];
};
in
lib.mkIf cfg.rocm.enable
[
"L+ /opt/rocm - - - - ${rocmEnv}"
];
};
in
lib.mkIf cfg.rocm.enable
[
"L+ /opt/rocm - - - - ${rocmEnv}"
];
};
};
}