ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

nix: remove a hack needed for nextest

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

Signed-off-by: Austin Seipp <aseipp@pobox.com>
This commit is contained in:
Austin Seipp 2024-06-29 18:11:44 -05:00
parent fe40c9e364
commit a3ca701556
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
flake.nix
View file

@ -48,12 +48,6 @@
libiconv 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 # these are needed in both devShell and buildInputs
linuxNativeDeps = with pkgs; lib.optionals stdenv.isLinux [ linuxNativeDeps = with pkgs; lib.optionals stdenv.isLinux [
mold-wrapped mold-wrapped
@ -113,7 +107,7 @@
preCheck = '' preCheck = ''
export RUST_BACKTRACE=1 export RUST_BACKTRACE=1
'' + darwinNextestHack; '';
postInstall = '' postInstall = ''
$out/bin/jj util mangen > ./jj.1 $out/bin/jj util mangen > ./jj.1
@ -185,7 +179,7 @@
export LIBSSH2_SYS_USE_PKG_CONFIG=1 export LIBSSH2_SYS_USE_PKG_CONFIG=1
export RUSTFLAGS="-Zthreads=0 ${rustLinkFlagsString}" export RUSTFLAGS="-Zthreads=0 ${rustLinkFlagsString}"
'' + darwinNextestHack; '';
}; };
})); }));
} }