about summary refs log tree commit diff
path: root/pkgs/development/tools/rust/rustup
diff options
context:
space:
mode:
authorFlakebi <flakebi@t-online.de>2020-06-27 11:50:42 +0200
committerzowoq <59103226+zowoq@users.noreply.github.com>2020-07-03 08:53:57 +1000
commitdeb78151a9438fb202842d9dbe348365cfd767e0 (patch)
tree480984365bf13654e40f9158ade03a6d7ae53598 /pkgs/development/tools/rust/rustup
parent9dcb508f2d0ce702d8e7aded53e331aab4a33625 (diff)
buildRustPackage: fix cargoBuildFlags
When features were supplied in cargoBuildFlags, the binaries were built
with these features enabled. Unless checking was disabled, `cargo test`
was executed without these build flags, meaning the binaries were
rebuilt and overwritten without the specified features.

Fix this bug by running tests after the installation phase.
Diffstat (limited to 'pkgs/development/tools/rust/rustup')
-rw-r--r--pkgs/development/tools/rust/rustup/default.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix
index 688159445d5ac..e4f15a44308a1 100644
--- a/pkgs/development/tools/rust/rustup/default.nix
+++ b/pkgs/development/tools/rust/rustup/default.nix
@@ -39,7 +39,9 @@ rustPlatform.buildRustPackage rec {
     )
   ];
 
-  doCheck = !stdenv.isAarch64 && !stdenv.isDarwin;
+  # Disable tests until they can be run with --features no-self-update
+  doCheck = false;
+  #doCheck = !stdenv.isAarch64 && !stdenv.isDarwin;
 
   postInstall = ''
     pushd $out/bin