colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rocmPackages: remove gcc12Stdenv usage, move rocgdb to rocmClangStdenv

Browse Source 
Other packages use the default stdenv now.
This commit is contained in:
Indy Ray 2024-02-29 23:34:39 +01:00 committed by Martin Schwaighofer
parent 5eac14880e
commit 44b03bd350
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/rocm-modules/6/default.nix
View File

@ -1,4 +1,4 @@
{ gcc12Stdenv # FIXME: Try removing this with a new ROCm release https://github.com/NixOS/nixpkgs/issues/271943 { stdenv
, callPackage , callPackage
, recurseIntoAttrs , recurseIntoAttrs
, symlinkJoin , symlinkJoin
@ -73,12 +73,11 @@ in rec {
# Broken, too many errors # Broken, too many errors
rdc = callPackage ./rdc { rdc = callPackage ./rdc {
inherit rocmUpdateScript rocm-smi rocm-runtime; inherit rocmUpdateScript rocm-smi rocm-runtime stdenv;
stdenv = gcc12Stdenv;
# stdenv = llvm.rocmClangStdenv; # stdenv = llvm.rocmClangStdenv;
}; };
rocm-docs-core = python3Packages.callPackage ./rocm-docs-core { stdenv = gcc12Stdenv; }; rocm-docs-core = python3Packages.callPackage ./rocm-docs-core { inherit stdenv; };
hip-common = callPackage ./hip-common { hip-common = callPackage ./hip-common {
inherit rocmUpdateScript; inherit rocmUpdateScript;
@ -106,22 +105,19 @@ in rec {
# Needs GCC # Needs GCC
rocprofiler = callPackage ./rocprofiler { rocprofiler = callPackage ./rocprofiler {
inherit rocmUpdateScript clr rocm-core rocm-thunk rocm-device-libs roctracer rocdbgapi rocm-smi hsa-amd-aqlprofile-bin; inherit rocmUpdateScript clr rocm-core rocm-thunk rocm-device-libs roctracer rocdbgapi rocm-smi hsa-amd-aqlprofile-bin stdenv;
inherit (llvm) clang; inherit (llvm) clang;
stdenv = gcc12Stdenv;
}; };
# Needs GCC # Needs GCC
roctracer = callPackage ./roctracer { roctracer = callPackage ./roctracer {
inherit rocmUpdateScript rocm-device-libs rocm-runtime clr; inherit rocmUpdateScript rocm-device-libs rocm-runtime clr stdenv;
stdenv = gcc12Stdenv;
}; };
# Needs GCC
rocgdb = callPackage ./rocgdb { rocgdb = callPackage ./rocgdb {
inherit rocmUpdateScript; inherit rocmUpdateScript;
elfutils = elfutils.override { enableDebuginfod = true; }; elfutils = elfutils.override { enableDebuginfod = true; };
stdenv = gcc12Stdenv; stdenv = llvm.rocmClangStdenv;
}; };
rocdbgapi = callPackage ./rocdbgapi { rocdbgapi = callPackage ./rocdbgapi {