diff --git a/pkgs/development/python-modules/warp-lang/darwin-libcxx.patch b/pkgs/development/python-modules/warp-lang/darwin-libcxx.patch
index beda9f58e6de..8b1cb03afea0 100644
--- a/pkgs/development/python-modules/warp-lang/darwin-libcxx.patch
+++ b/pkgs/development/python-modules/warp-lang/darwin-libcxx.patch
@@ -2,14 +2,6 @@ diff --git a/warp/build_dll.py b/warp/build_dll.py
 index 2218ff13..53786017 100644
 --- a/warp/build_dll.py
 +++ b/warp/build_dll.py
-@@ -408,6 +408,7 @@ def build_dll_for_arch(args, dll_path, cpp_paths, cu_path, arch, libs: Optional[
-         cpp_includes += f' -I"{warp_home_path.parent}/_build/host-deps/llvm-project/release-{arch}/include"'
-         cuda_includes = f' -I"{cuda_home}/include"' if cu_path else ""
-         includes = cpp_includes + cuda_includes
-+        includes += " -isystem @LIBCXX_DEV@/include/c++/v1"
- 
-         if sys.platform == "darwin":
-             version = f"--target={arch}-apple-macos11"
 @@ -441,6 +442,7 @@ def build_dll_for_arch(args, dll_path, cpp_paths, cu_path, arch, libs: Optional[
                  build_cmd = f'{cpp_compiler} {cpp_flags} -c "{cpp_path}" -o "{cpp_out}"'
                  run_cmd(build_cmd)
diff --git a/pkgs/development/python-modules/warp-lang/default.nix b/pkgs/development/python-modules/warp-lang/default.nix
index 0f90b01b2801..414d62197ace 100644
--- a/pkgs/development/python-modules/warp-lang/default.nix
+++ b/pkgs/development/python-modules/warp-lang/default.nix
@@ -67,7 +67,6 @@ buildPythonPackage {
   ]
   ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [
     (replaceVars ./darwin-libcxx.patch {
-      LIBCXX_DEV = llvmPackages.libcxx.dev;
       LIBCXX_LIB = llvmPackages.libcxx;
     })
 
@@ -224,22 +223,24 @@ buildPythonPackage {
     inherit libmathdx;
 
     # Scripts which provide test packages and implement test logic.
-    testers.unit-tests = writeShellApplication {
-      name = "warp-lang-unit-tests";
-      runtimeInputs = [
+    testers.unit-tests =
+      let
         # Use the references from args
-        (python.withPackages (_: [
+        python' = python.withPackages (_: [
           warp-lang
           jax
           torch
-        ]))
+        ]);
         # Disable paddlepaddle interop tests: malloc(): unaligned tcache chunk detected
         #  (paddlepaddle.override { inherit cudaSupport; })
-      ];
-      text = ''
-        python3 -m warp.tests
-      '';
-    };
+      in
+      writeShellApplication {
+        name = "warp-lang-unit-tests";
+        runtimeInputs = [ python' ];
+        text = ''
+          ${python'}/bin/python3 -m warp.tests
+        '';
+      };
 
     # Tests run within the Nix sandbox.
     tests =