From 645a298fb34fb8b882540da4285733afb3e8bcdb Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Wed, 24 Sep 2025 07:03:33 -0700
Subject: [PATCH] rocmPackages.hipcc: don't depend on rocm-merged-llvm

---
 pkgs/development/rocm-modules/6/default.nix      |  5 +----
 .../development/rocm-modules/6/hipcc/default.nix | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix
index 7c259148e23d..4bacc45b30ee 100644
--- a/pkgs/development/rocm-modules/6/default.nix
+++ b/pkgs/development/rocm-modules/6/default.nix
@@ -80,10 +80,7 @@ let
 
       hip-common = self.callPackage ./hip-common { };
 
-      hipcc = self.callPackage ./hipcc {
-        stdenv = origStdenv;
-        inherit (llvm) rocm-merged-llvm;
-      };
+      hipcc = self.callPackage ./hipcc { stdenv = origStdenv; };
 
       # Replaces hip, opencl-runtime, and rocclr
       clr = self.callPackage ./clr { };
diff --git a/pkgs/development/rocm-modules/6/hipcc/default.nix b/pkgs/development/rocm-modules/6/hipcc/default.nix
index 4dc1c609036e..1525cb49b223 100644
--- a/pkgs/development/rocm-modules/6/hipcc/default.nix
+++ b/pkgs/development/rocm-modules/6/hipcc/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  rocm-merged-llvm,
+  llvm,
   cmake,
   lsb-release,
 }:
@@ -9,13 +9,19 @@
 stdenv.mkDerivation (finalAttrs: {
   pname = "hipcc";
   # In-tree with ROCm LLVM
-  inherit (rocm-merged-llvm) version;
-  src = rocm-merged-llvm.llvm-src;
+  inherit (llvm.llvm) version;
+  src = llvm.llvm.monorepoSrc;
   sourceRoot = "${finalAttrs.src.name}/amd/hipcc";
+  strictDeps = true;
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    llvm.rocm-toolchain
+    cmake
+  ];
 
-  buildInputs = [ rocm-merged-llvm ];
+  buildInputs = [
+    llvm.clang-unwrapped
+  ];
 
   patches = [
     # https://github.com/ROCm/llvm-project/pull/183