From 7e0561370ba0302e65352225eb5cfc1a2d24aa1b Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 14 Aug 2018 10:40:47 +0300 Subject: [PATCH] rust: Set dontUpdateAutotoolsGnuConfigScripts everywhere It's needed on ARM nowadays as well, so just put it everywhere. --- pkgs/development/compilers/rust/cargo.nix | 4 ++-- pkgs/development/compilers/rust/rustc.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 2ff3257c7fb..34932c911eb 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -19,8 +19,8 @@ rustPlatform.buildRustPackage rec { passthru.rustc = rustc; - # changes hash of vendor directory otherwise on aarch64 - dontUpdateAutotoolsGnuConfigScripts = if stdenv.isAarch64 then "1" else null; + # changes hash of vendor directory otherwise + dontUpdateAutotoolsGnuConfigScripts = true; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cacert file curl python openssl cmake zlib makeWrapper libgit2 ] diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index f3f9e2f57b7..23aa750060a 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -32,8 +32,8 @@ stdenv.mkDerivation { __darwinAllowLocalNetworking = true; - # The build will fail at the very end on AArch64 without this. - dontUpdateAutotoolsGnuConfigScripts = if stdenv.isAarch64 then true else null; + # rustc complains about modified source files otherwise + dontUpdateAutotoolsGnuConfigScripts = true; # Running the default `strip -S` command on Darwin corrupts the # .rlib files in "lib/".