diff --git a/pkgs/development/rocm-modules/5/llvm/stage-2/1000-libcxx-failing-tests.list b/pkgs/development/rocm-modules/5/llvm/stage-2/1000-libcxx-failing-tests.list
index d5e1f675079f..a70c98d4e473 100644
--- a/pkgs/development/rocm-modules/5/llvm/stage-2/1000-libcxx-failing-tests.list
+++ b/pkgs/development/rocm-modules/5/llvm/stage-2/1000-libcxx-failing-tests.list
@@ -173,3 +173,4 @@
 ../libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array14.pass.cpp
 ../libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete14.pass.cpp
 ../libcxx/test/libcxx/selftest/sh.cpp/empty.sh.cpp
+../libcxx/test/libcxx/transitive_includes.sh.cpp
diff --git a/pkgs/development/rocm-modules/5/tensile/default.nix b/pkgs/development/rocm-modules/5/tensile/default.nix
index bb8db155c42a..262939c0ae67 100644
--- a/pkgs/development/rocm-modules/5/tensile/default.nix
+++ b/pkgs/development/rocm-modules/5/tensile/default.nix
@@ -12,6 +12,7 @@
   joblib,
   filelock,
   rocminfo,
+  writeText,
 }:
 
 buildPythonPackage rec {
@@ -47,6 +48,12 @@ buildPythonPackage rec {
     export ROCM_PATH=${rocminfo}
   '';
 
+  # TODO: remove this workaround once https://github.com/NixOS/nixpkgs/pull/323869
+  # does not cause issues anymore, or at least replace it with a better workaround
+  setupHook = writeText "setup-hook" ''
+    export TENSILE_ROCM_ASSEMBLER_PATH="${stdenv.cc.cc}/bin/clang++";
+  '';
+
   pythonImportsCheck = [ "Tensile" ];
 
   passthru.updateScript = rocmUpdateScript {
diff --git a/pkgs/development/rocm-modules/6/tensile/default.nix b/pkgs/development/rocm-modules/6/tensile/default.nix
index 0a1f4d60ea5e..e2a892b34308 100644
--- a/pkgs/development/rocm-modules/6/tensile/default.nix
+++ b/pkgs/development/rocm-modules/6/tensile/default.nix
@@ -13,6 +13,7 @@
   joblib,
   filelock,
   rocminfo,
+  writeText,
 }:
 
 buildPythonPackage rec {
@@ -61,6 +62,12 @@ buildPythonPackage rec {
     ROCM_PATH = rocminfo;
   };
 
+  # TODO: remove this workaround once https://github.com/NixOS/nixpkgs/pull/323869
+  # does not cause issues anymore, or at least replace it with a better workaround
+  setupHook = writeText "setup-hook" ''
+    export TENSILE_ROCM_ASSEMBLER_PATH="${stdenv.cc.cc}/bin/clang++";
+  '';
+
   pythonImportsCheck = [ "Tensile" ];
 
   passthru.updateScript = rocmUpdateScript {