mirror of
https://github.com/oxalica/rust-overlay.git
synced 2024-10-04 05:07:13 +03:00
Fix propagatedBuildInputs for darwin
Linker arguments contains `-liconv` on darwin.
This commit is contained in:
parent
9960d69992
commit
f54319893f
@ -263,6 +263,11 @@ let
|
||||
--replace "@miri@" "$cargo_miri" \
|
||||
--replace "@out@" "$out"
|
||||
fi
|
||||
|
||||
# `symlinkJoin` (`runCommand`) doesn't handle propagatedBuildInputs.
|
||||
# Need to do it manually.
|
||||
mkdir -p "$out/nix-support"
|
||||
echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs"
|
||||
'';
|
||||
|
||||
# Add the compiler as part of the propagated build inputs in order
|
||||
@ -271,7 +276,9 @@ let
|
||||
# $ nix-shell -p rustChannels.stable.rust
|
||||
#
|
||||
# And get a fully working Rust compiler, with the stdenv linker.
|
||||
propagatedBuildInputs = [ self.stdenv.cc ];
|
||||
propagatedBuildInputs =
|
||||
[ self.stdenv.cc ] ++
|
||||
self.lib.optional (self.stdenv.hostPlatform.isDarwin) self.libiconv;
|
||||
|
||||
meta.platforms = self.lib.platforms.all;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user