summary refs log tree commit diff
path: root/pkgs/development/compilers/rust/rustc.nix
diff options
context:
space:
mode:
authorRobert Schütz <robert.schuetz@stud.uni-heidelberg.de>2018-04-10 09:13:36 +0200
committerRobert Schütz <robert.schuetz@stud.uni-heidelberg.de>2018-04-10 09:13:36 +0200
commit80fc5f2a24fc626218be6b9c24d3bf6ef86444fe (patch)
tree2fa67fa3181544f6bea4ee8a7f071461c55b4d92 /pkgs/development/compilers/rust/rustc.nix
parent0aa59a08d65461149552f68c638655ed2b474510 (diff)
parentc4f555a505f7cb2e7453459a5c734682532645e4 (diff)
downloadnixlib-80fc5f2a24fc626218be6b9c24d3bf6ef86444fe.tar
nixlib-80fc5f2a24fc626218be6b9c24d3bf6ef86444fe.tar.gz
nixlib-80fc5f2a24fc626218be6b9c24d3bf6ef86444fe.tar.bz2
nixlib-80fc5f2a24fc626218be6b9c24d3bf6ef86444fe.tar.lz
nixlib-80fc5f2a24fc626218be6b9c24d3bf6ef86444fe.tar.xz
nixlib-80fc5f2a24fc626218be6b9c24d3bf6ef86444fe.tar.zst
nixlib-80fc5f2a24fc626218be6b9c24d3bf6ef86444fe.zip
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/compilers/rust/rustc.nix')
-rw-r--r--pkgs/development/compilers/rust/rustc.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index f678286eadea..bb0794aeb84e 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -100,8 +100,10 @@ stdenv.mkDerivation {
 
     # Useful debugging parameter
     # export VERBOSE=1
-  ''
-  + optionalString stdenv.isDarwin ''
+  '' + optionalString stdenv.isAarch64 ''
+    # https://github.com/rust-lang/rust/issues/49807
+    rm -vr src/test/debuginfo/by-value-self-argument-in-trait-impl.rs
+  '' + optionalString stdenv.isDarwin ''
     # Disable all lldb tests.
     # error: Can't run LLDB test because LLDB's python path is not set
     rm -vr src/test/debuginfo/*