Skip to content

Commit

Permalink
nix: remove a hack needed for nextest
Browse files Browse the repository at this point in the history
The relevant upstream issue has been fixed since version 0.9.72,
as noticed by Emily.

Signed-off-by: Austin Seipp <[email protected]>
  • Loading branch information
thoughtpolice committed Jun 30, 2024
1 parent fe40c9e commit a3ca701
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -113,7 +107,7 @@

preCheck = ''
export RUST_BACKTRACE=1
'' + darwinNextestHack;
'';

postInstall = ''
$out/bin/jj util mangen > ./jj.1
Expand Down Expand Up @@ -185,7 +179,7 @@
export LIBSSH2_SYS_USE_PKG_CONFIG=1
export RUSTFLAGS="-Zthreads=0 ${rustLinkFlagsString}"
'' + darwinNextestHack;
'';
};
}));
}

0 comments on commit a3ca701

Please sign in to comment.