JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rust: fix sandbox build on darwin

Browse Source
This commit is contained in:
Daiderd Jordan 2017-12-28 20:42:23 +01:00 committed by Robin Gloster
parent 375f50fa11
commit fdaab47d58
2 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
pkgs/development/compilers/rust/binaryBuild.nix
View File

@ -12,26 +12,6 @@ let
bootstrapping = versionType == "bootstrap";
patchBootstrapCargo = ''
${optionalString (stdenv.isLinux && bootstrapping) ''
patchelf \
--set-rpath "${stdenv.lib.makeLibraryPath [ curl zlib ]}" \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
"$out/bin/cargo"
''}
${optionalString (stdenv.isDarwin && bootstrapping) ''
install_name_tool \
-change /usr/lib/libiconv.2.dylib '${getLib libiconv}/lib/libiconv.2.dylib' \
"$out/bin/cargo"
install_name_tool \
-change /usr/lib/libcurl.4.dylib '${getLib curl}/lib/libcurl.4.dylib' \
"$out/bin/cargo"
install_name_tool \
-change /usr/lib/libz.1.dylib '${getLib zlib}/lib/libz.1.dylib' \
"$out/bin/cargo"
''}
'';
installComponents
= "rustc,rust-std-${platform}"
+ (optionalString bootstrapping ",rust-docs,cargo")
@ -56,7 +36,7 @@ rec {
phases = ["unpackPhase" "installPhase" "fixupPhase"];
propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin Security;
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
installPhase = ''
./install.sh --prefix=$out \
@ -69,14 +49,21 @@ rec {
patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
"$out/bin/rustdoc"
''}
${optionalString (stdenv.isDarwin && bootstrapping) ''
install_name_tool -change /usr/lib/libiconv.2.dylib '${darwin.libiconv}/lib/libiconv.2.dylib' "$out/bin/cargo"
install_name_tool -change /usr/lib/libcurl.4.dylib '${stdenv.lib.getLib curl}/lib/libcurl.4.dylib' "$out/bin/cargo"
install_name_tool -change /usr/lib/libz.1.dylib '${stdenv.lib.getLib zlib}/lib/libz.1.dylib' "$out/bin/cargo"
patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
"$out/bin/cargo"
''}
${patchBootstrapCargo}
${optionalString (stdenv.isDarwin && bootstrapping) ''
install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/rustc"
install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/rustdoc"
install_name_tool -change /usr/lib/libiconv.2.dylib '${darwin.libiconv}/lib/libiconv.2.dylib' "$out/bin/cargo"
install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/cargo"
install_name_tool -change /usr/lib/libcurl.4.dylib '${stdenv.lib.getLib curl}/lib/libcurl.4.dylib' "$out/bin/cargo"
for f in $out/lib/lib*.dylib; do
install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$f"
done
''}
# Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc
# (or similar) here. It causes strange effects where rustc loads
@ -101,14 +88,23 @@ rec {
phases = ["unpackPhase" "installPhase" "fixupPhase"];
buildInputs = [ makeWrapper ];
propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin Security;
buildInputs = [ makeWrapper ] ++ stdenv.lib.optional stdenv.isDarwin Security;
installPhase = ''
./install.sh --prefix=$out \
--components=cargo
${patchBootstrapCargo}
${optionalString (stdenv.isLinux && bootstrapping) ''
patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
"$out/bin/cargo"
''}
${optionalString (stdenv.isDarwin && bootstrapping) ''
install_name_tool -change /usr/lib/libiconv.2.dylib '${darwin.libiconv}/lib/libiconv.2.dylib' "$out/bin/cargo"
install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/cargo"
install_name_tool -change /usr/lib/libcurl.4.dylib '${stdenv.lib.getLib curl}/lib/libcurl.4.dylib' "$out/bin/cargo"
''}
wrapProgram "$out/bin/cargo" \
--suffix PATH : "${rustc}/bin"

3
pkgs/development/compilers/rust/rustc.nix
View File

@ -17,13 +17,13 @@
let
inherit (stdenv.lib) optional optionalString;
inherit (darwin.apple_sdk.frameworks) Security;
procps = if stdenv.isDarwin then darwin.ps else args.procps;
llvmShared = llvm.override { enableSharedLibraries = true; };
target = builtins.replaceStrings [" "] [","] (builtins.toString targets);
in
stdenv.mkDerivation {
@ -141,6 +141,7 @@ stdenv.mkDerivation {
++ optional (!stdenv.isDarwin) gdb;
buildInputs = [ ncurses ] ++ targetToolchains
++ optional stdenv.isDarwin Security
++ optional (!forceBundledLLVM) llvmShared;
outputs = [ "out" "man" "doc" ];