pyrox.dev / nixpkgs
lol
fork atom

rocmPackages_5: pin stdenv to GCC 12

Try reverting this on a future ROCm release.

Addresses: https://github.com/NixOS/nixpkgs/issues/271943

authored by Madoura and committed by Adam Joseph 93ebe44a 66e21255

+25 -16
unified split
+7 -2
pkgs/development/rocm-modules/5/default.nix
··· 1 - { callPackage 1 + { gcc12Stdenv # FIXME: Try removing this with a new ROCm release https://github.com/NixOS/nixpkgs/issues/271943 2 + , callPackage 2 3 , recurseIntoAttrs 3 4 , symlinkJoin 4 5 , fetchFromGitHub ··· 73 74 # Broken, too many errors 74 75 rdc = callPackage ./rdc { 75 76 inherit rocmUpdateScript rocm-smi rocm-runtime; 77 + stdenv = gcc12Stdenv; 76 78 # stdenv = llvm.rocmClangStdenv; 77 79 }; 78 80 79 - rocm-docs-core = python3Packages.callPackage ./rocm-docs-core { }; 81 + rocm-docs-core = python3Packages.callPackage ./rocm-docs-core { stdenv = gcc12Stdenv; }; 80 82 81 83 ## ROCm-Developer-Tools ## 82 84 hip-common = callPackage ./hip-common { ··· 107 109 rocprofiler = callPackage ./rocprofiler { 108 110 inherit rocmUpdateScript clr rocm-core rocm-thunk rocm-device-libs roctracer rocdbgapi rocm-smi hsa-amd-aqlprofile-bin; 109 111 inherit (llvm) clang; 112 + stdenv = gcc12Stdenv; 110 113 }; 111 114 112 115 # Needs GCC 113 116 roctracer = callPackage ./roctracer { 114 117 inherit rocmUpdateScript rocm-device-libs rocm-runtime clr; 118 + stdenv = gcc12Stdenv; 115 119 }; 116 120 117 121 # Needs GCC 118 122 rocgdb = callPackage ./rocgdb { 119 123 inherit rocmUpdateScript; 120 124 elfutils = elfutils.override { enableDebuginfod = true; }; 125 + stdenv = gcc12Stdenv; 121 126 }; 122 127 123 128 rocdbgapi = callPackage ./rocdbgapi {
+9 -8
pkgs/development/rocm-modules/5/llvm/default.nix
··· 1 - { stdenv 1 + { # stdenv FIXME: Try changing back to this with a new ROCm release https://github.com/NixOS/nixpkgs/issues/271943 2 + gcc12Stdenv 2 3 , callPackage 3 4 , rocmUpdateScript 4 5 , wrapBintoolsWith ··· 12 13 let 13 14 ## Stage 1 ## 14 15 # Projects 15 - llvm = callPackage ./stage-1/llvm.nix { inherit rocmUpdateScript; }; 16 - clang-unwrapped = callPackage ./stage-1/clang-unwrapped.nix { inherit rocmUpdateScript llvm; }; 17 - lld = callPackage ./stage-1/lld.nix { inherit rocmUpdateScript llvm; }; 16 + llvm = callPackage ./stage-1/llvm.nix { inherit rocmUpdateScript; stdenv = gcc12Stdenv; }; 17 + clang-unwrapped = callPackage ./stage-1/clang-unwrapped.nix { inherit rocmUpdateScript llvm; stdenv = gcc12Stdenv; }; 18 + lld = callPackage ./stage-1/lld.nix { inherit rocmUpdateScript llvm; stdenv = gcc12Stdenv; }; 18 19 19 20 # Runtimes 20 - runtimes = callPackage ./stage-1/runtimes.nix { inherit rocmUpdateScript llvm; }; 21 + runtimes = callPackage ./stage-1/runtimes.nix { inherit rocmUpdateScript llvm; stdenv = gcc12Stdenv; }; 21 22 22 23 ## Stage 2 ## 23 24 # Helpers 24 25 bintools-unwrapped = callPackage ./stage-2/bintools-unwrapped.nix { inherit llvm lld; }; 25 26 bintools = wrapBintoolsWith { bintools = bintools-unwrapped; }; 26 - rStdenv = callPackage ./stage-2/rstdenv.nix { inherit llvm clang-unwrapped lld runtimes bintools; }; 27 + rStdenv = callPackage ./stage-2/rstdenv.nix { inherit llvm clang-unwrapped lld runtimes bintools; stdenv = gcc12Stdenv; }; 27 28 in rec { 28 29 inherit 29 30 llvm ··· 40 41 41 42 ## Stage 3 ## 42 43 # Helpers 43 - clang = callPackage ./stage-3/clang.nix { inherit llvm lld clang-unwrapped bintools libc libunwind libcxxabi libcxx compiler-rt; }; 44 - rocmClangStdenv = overrideCC stdenv clang; 44 + clang = callPackage ./stage-3/clang.nix { inherit llvm lld clang-unwrapped bintools libc libunwind libcxxabi libcxx compiler-rt; stdenv = gcc12Stdenv; }; 45 + rocmClangStdenv = overrideCC gcc12Stdenv clang; 45 46 46 47 # Projects 47 48 clang-tools-extra = callPackage ./stage-3/clang-tools-extra.nix { inherit rocmUpdateScript llvm clang-unwrapped; stdenv = rocmClangStdenv; };
+3 -2
pkgs/development/rocm-modules/5/llvm/stage-1/clang-unwrapped.nix
··· 1 - { callPackage 1 + { stdenv 2 + , callPackage 2 3 , rocmUpdateScript 3 4 , llvm 4 5 }: 5 6 6 7 callPackage ../base.nix rec { 7 - inherit rocmUpdateScript; 8 + inherit stdenv rocmUpdateScript; 8 9 targetName = "clang-unwrapped"; 9 10 targetDir = "clang"; 10 11 extraBuildInputs = [ llvm ];
+3 -2
pkgs/development/rocm-modules/5/llvm/stage-1/lld.nix
··· 1 - { callPackage 1 + { stdenv 2 + , callPackage 2 3 , rocmUpdateScript 3 4 , llvm 4 5 }: 5 6 6 7 callPackage ../base.nix rec { 7 - inherit rocmUpdateScript; 8 + inherit stdenv rocmUpdateScript; 8 9 buildMan = false; # No man pages to build 9 10 targetName = "lld"; 10 11 targetDir = targetName;
+1 -1
pkgs/development/rocm-modules/5/llvm/stage-1/llvm.nix
··· 4 4 }: 5 5 6 6 callPackage ../base.nix { 7 - inherit rocmUpdateScript; 7 + inherit stdenv rocmUpdateScript; 8 8 requiredSystemFeatures = [ "big-parallel" ]; 9 9 isBroken = stdenv.isAarch64; # https://github.com/RadeonOpenCompute/ROCm/issues/1831#issuecomment-1278205344 10 10 }
+2 -1
pkgs/development/rocm-modules/5/llvm/stage-1/runtimes.nix
··· 1 1 { lib 2 + , stdenv 2 3 , callPackage 3 4 , rocmUpdateScript 4 5 , llvm 5 6 }: 6 7 7 8 callPackage ../base.nix rec { 8 - inherit rocmUpdateScript; 9 + inherit stdenv rocmUpdateScript; 9 10 buildDocs = false; 10 11 buildMan = false; 11 12 buildTests = false;