alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

rust: Set dontUpdateAutotoolsGnuConfigScripts everywhere

Browse source 
It's needed on ARM nowadays as well, so just put it everywhere.
This commit is contained in:
Tuomas Tynkkynen 2018-08-14 10:40:47 +03:00
parent 751f10e84d
commit 7e0561370b
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/compilers/rust/cargo.nix
View file

@ -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 ]

4
pkgs/development/compilers/rust/rustc.nix
View file

@ -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/".