Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

rocmPackages.hipcc: don't depend on rocm-merged-llvm

Luna Nova 645a298f d481667c

+12 -9
+1 -4
pkgs/development/rocm-modules/6/default.nix
··· 80 80 81 81 hip-common = self.callPackage ./hip-common { }; 82 82 83 - hipcc = self.callPackage ./hipcc { 84 - stdenv = origStdenv; 85 - inherit (llvm) rocm-merged-llvm; 86 - }; 83 + hipcc = self.callPackage ./hipcc { stdenv = origStdenv; }; 87 84 88 85 # Replaces hip, opencl-runtime, and rocclr 89 86 clr = self.callPackage ./clr { };
+11 -5
pkgs/development/rocm-modules/6/hipcc/default.nix
··· 1 1 { 2 2 lib, 3 3 stdenv, 4 - rocm-merged-llvm, 4 + llvm, 5 5 cmake, 6 6 lsb-release, 7 7 }: ··· 9 9 stdenv.mkDerivation (finalAttrs: { 10 10 pname = "hipcc"; 11 11 # In-tree with ROCm LLVM 12 - inherit (rocm-merged-llvm) version; 13 - src = rocm-merged-llvm.llvm-src; 12 + inherit (llvm.llvm) version; 13 + src = llvm.llvm.monorepoSrc; 14 14 sourceRoot = "${finalAttrs.src.name}/amd/hipcc"; 15 + strictDeps = true; 15 16 16 - nativeBuildInputs = [ cmake ]; 17 + nativeBuildInputs = [ 18 + llvm.rocm-toolchain 19 + cmake 20 + ]; 17 21 18 - buildInputs = [ rocm-merged-llvm ]; 22 + buildInputs = [ 23 + llvm.clang-unwrapped 24 + ]; 19 25 20 26 patches = [ 21 27 # https://github.com/ROCm/llvm-project/pull/183