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

rustc: fix sandbox build on darwin

Browse Source
This commit is contained in:
Daiderd Jordan 2017-10-31 07:37:15 +01:00 committed by Dan Peebles
parent dadcca3f40
commit 8a43659e15
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, makeWrapper, cacert, zlib, buildRustPackage, curl { stdenv, fetchurl, makeWrapper, cacert, zlib, buildRustPackage, curl, darwin
, version , version
, src , src
, platform , platform
@ -36,6 +36,8 @@ rec {
phases = ["unpackPhase" "installPhase"]; phases = ["unpackPhase" "installPhase"];
propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
installPhase = '' installPhase = ''
./install.sh --prefix=$out \ ./install.sh --prefix=$out \
--components=${installComponents} --components=${installComponents}
@ -49,6 +51,11 @@ rec {
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
"$out/bin/cargo" "$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/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"
''}
${optionalString needsPatchelf '' ${optionalString needsPatchelf ''
patchelf \ patchelf \

4
pkgs/development/compilers/rust/bootstrap.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, makeWrapper, cacert, zlib, curl }: { stdenv, fetchurl, makeWrapper, cacert, zlib, curl, darwin }:
let let
# Note: the version MUST be one version prior to the version we're # Note: the version MUST be one version prior to the version we're
@ -30,7 +30,7 @@ let
}; };
in import ./binaryBuild.nix in import ./binaryBuild.nix
{ inherit stdenv fetchurl makeWrapper cacert zlib curl; { inherit stdenv fetchurl makeWrapper cacert zlib curl darwin;
buildRustPackage = null; buildRustPackage = null;
inherit version src platform; inherit version src platform;
versionType = "bootstrap"; versionType = "bootstrap";

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

@ -32,7 +32,7 @@ stdenv.mkDerivation {
inherit src; inherit src;
__impureHostDeps = [ "/usr/lib/libedit.3.dylib" ]; __darwinAllowLocalNetworking = true;
NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${llvmShared}/lib"; NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${llvmShared}/lib";
@ -109,6 +109,14 @@ stdenv.mkDerivation {
# Disable all lldb tests. # Disable all lldb tests.
# error: Can't run LLDB test because LLDB's python path is not set # error: Can't run LLDB test because LLDB's python path is not set
rm -vr src/test/debuginfo/* rm -vr src/test/debuginfo/*
# Disable tests that fail when sandboxing is enabled.
substituteInPlace src/libstd/sys/unix/ext/net.rs \
--replace '#[test]' '#[test] #[ignore]'
substituteInPlace src/test/run-pass/env-home-dir.rs \
--replace 'home_dir().is_some()' true
rm -v src/test/run-pass/fds-are-cloexec.rs # FIXME: pipes?
rm -v src/test/run-pass/sync-send-in-std.rs # FIXME: ???
''; '';
preConfigure = '' preConfigure = ''