From a3ca701556904c4b1e6bc61aa3ed7c61343caf3d Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 29 Jun 2024 18:11:44 -0500
Subject: [PATCH] nix: remove a hack needed for nextest

The relevant upstream issue has been fixed since version 0.9.72,
as noticed by Emily.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 flake.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/flake.nix b/flake.nix
index 22be80679..7089f5812 100644
--- a/flake.nix
+++ b/flake.nix
@@ -48,12 +48,6 @@
         libiconv
       ];
 
-      # work around https://github.com/nextest-rs/nextest/issues/267
-      # this needs to exist in both the devShell and preCheck phase!
-      darwinNextestHack = pkgs.lib.optionalString pkgs.stdenv.isDarwin ''
-        export DYLD_FALLBACK_LIBRARY_PATH=$(${ourRustVersion}/bin/rustc --print sysroot)/lib
-      '';
-      
       # these are needed in both devShell and buildInputs
       linuxNativeDeps = with pkgs; lib.optionals stdenv.isLinux [
         mold-wrapped
@@ -113,7 +107,7 @@
 
           preCheck = ''
             export RUST_BACKTRACE=1
-          '' + darwinNextestHack;
+          '';
 
           postInstall = ''
             $out/bin/jj util mangen > ./jj.1
@@ -185,7 +179,7 @@
           export LIBSSH2_SYS_USE_PKG_CONFIG=1
 
           export RUSTFLAGS="-Zthreads=0 ${rustLinkFlagsString}"
-        '' + darwinNextestHack;
+        '';
       };
     }));
 }