Skip to content

rust-overlay: restore SYSROOT detection for Darwin #309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ggreif wants to merge 3 commits into
base: master
Choose a base branch
from
Open

rust-overlay: restore SYSROOT detection for Darwin #309

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c72bae8
Handle Darwin too w.r.t. SYSROOT detection fix
ggreif Apr 25, 2023
1b9dec4
Merge branch 'master' into master
ggreif Jul 31, 2023
1ca9ee7
use `stdenv.hostPlatform.extensions.sharedLibrary` to remove duplicat…
ggreif Jul 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions rust-overlay.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,12 +295,11 @@ let
fi
done

# Here we copy the librustc_driver-*.so to our derivation.
# Here we copy the librustc_driver-*.{so,dylib} to our derivation.
# The SYSROOT is determined based on the path of this library.
if test "" != $out/lib/librustc_driver-*.so &> /dev/null; then
RUSTC_DRIVER_PATH=$(realpath -e $out/lib/librustc_driver-*.so)
rm $out/lib/librustc_driver-*.so
cp $RUSTC_DRIVER_PATH $out/lib/
if test "" != $out/lib/librustc_driver-*${stdenv.hostPlatform.extensions.sharedLibrary} &> /dev/null; then
RUSTC_DRIVER_PATH=$(realpath -e $out/lib/librustc_driver-*${stdenv.hostPlatform.extensions.sharedLibrary})
cp --remove-destination $RUSTC_DRIVER_PATH $out/lib/
fi
'';

Expand Down