diff --git a/flake.lock b/flake.lock
index aafe6f4..b42d5d1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1748370509,
-        "narHash": "sha256-QlL8slIgc16W5UaI3w7xHQEP+Qmv/6vSNTpoZrrSlbk=",
+        "lastModified": 1750776420,
+        "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "4faa5f5321320e49a78ae7848582f684d64783e9",
+        "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf",
         "type": "github"
       },
       "original": {
diff --git a/pkgs/rocm-modules/llvm/default.nix b/pkgs/rocm-modules/llvm/default.nix
index 141c3df..187bd43 100644
--- a/pkgs/rocm-modules/llvm/default.nix
+++ b/pkgs/rocm-modules/llvm/default.nix
@@ -56,6 +56,8 @@ let
     stdenv.cc.bintools
     gcc-unwrapped
     stdenvToBuildRocmLlvm
+    stdenvToBuildRocmLlvm.cc
+    stdenvToBuildRocmLlvm.cc.cc
   ];
   gcc-prefix =
     let
@@ -146,31 +148,37 @@ let
     let
       linked = symlinkJoin { inherit name paths; };
     in
-    runCommand name { } ''
-      set -x
-      mkdir -p $out/
-      cp --reflink=auto -rL ${linked}/* $out/
-      chmod -R +rw $out
-      mkdir -p $out/usr
-      ln -s $out/ $out/usr/local
-      mkdir -p $out/nix-support/
-      rm -rf $out/lib64 # we don't need mixed 32 bit
-      echo 'export CC=clang' >> $out/nix-support/setup-hook
-      echo 'export CXX=clang++' >> $out/nix-support/setup-hook
-      mkdir -p $out/lib/clang/${llvmMajorVersion}/lib/linux/
-      ln -s $out/lib/linux/libclang_rt.* $out/lib/clang/${llvmMajorVersion}/lib/linux/
-      file $out/bin/.clang-wrapped
-      file $out/bin/.clang++-wrapped
-      find $out -type f -exec sed -i "s|${cc.out}|$out|g" {} +
-      find $out -type f -exec sed -i "s|${cc.dev}|$out|g" {} +
+    runCommand name
+      {
+        # If this is erroring, try why-depends --precise on the symlinkJoin of inputs to look for the problem
+        # nix why-depends --precise .#rocmPackages.llvm.rocmcxx.linked /store/path/its/not/allowed
+        disallowedRequisites = disallowedRefsForToolchain;
+        passthru.linked = linked;
+      }
+      ''
+        set -x
+        mkdir -p $out/
+        cp --reflink=auto -rL ${linked}/* $out/
+        chmod -R +rw $out
+        mkdir -p $out/usr
+        ln -s $out/ $out/usr/local
+        mkdir -p $out/nix-support/
+        # we don't need mixed 32 bit, the presence of lib64 is used by LLVM to decide it's a multilib sysroot
+        rm -rf $out/lib64
+        echo 'export CC=clang' >> $out/nix-support/setup-hook
+        echo 'export CXX=clang++' >> $out/nix-support/setup-hook
+        mkdir -p $out/lib/clang/${llvmMajorVersion}/lib/linux/
+        ln -s $out/lib/linux/libclang_rt.* $out/lib/clang/${llvmMajorVersion}/lib/linux/
+
+        find $out -type f -exec sed -i "s|${cc.out}|$out|g" {} +
+        find $out -type f -exec sed -i "s|${cc.dev}|$out|g" {} +
+
+        # our /include now has more than clang expects, so this specific dir still needs to point to cc.dev
+        # FIXME: could copy into a different subdir?
+        sed -i 's|set(CLANG_INCLUDE_DIRS.*$|set(CLANG_INCLUDE_DIRS "${cc.dev}/include")|g' $out/lib/cmake/clang/ClangConfig.cmake
+        ${lib.getExe rdfind} -makesymlinks true $out/ # create links *within* the sysroot to save space
+      '';
 
-      file $out/bin/.clang-wrapped
-      file $out/bin/.clang++-wrapped
-      # our /include now has more than clang expects, so this specific dir still needs to point to cc.dev
-      # FIXME: could copy into a different subdir?
-      sed -i 's|set(CLANG_INCLUDE_DIRS.*$|set(CLANG_INCLUDE_DIRS "${cc.dev}/include")|g' $out/lib/cmake/clang/ClangConfig.cmake
-      ${lib.getExe rdfind} -makesymlinks true $out/ # create links *within* the sysroot to save space
-    '';
   findClangNostdlibincPatch =
     x:
     (
@@ -417,6 +425,8 @@ rec {
             + ''
               find $lib -type f -exec remove-references-to -t ${stdenv.cc.cc} {} +
               find $lib -type f -exec remove-references-to -t ${stdenv.cc.bintools} {} +
+              find $lib -type f -exec remove-references-to -t ${stdenvToBuildRocmLlvm.cc} {} +
+              find $lib -type f -exec remove-references-to -t ${stdenv.cc} {} +
             '';
           preConfigure =
             (old.preConfigure or "")