Skip to content

Commit

Permalink
Revert "buildRustPackage: fix cargoBuildFlags"
Browse files Browse the repository at this point in the history
This reverts commit deb7815.

Mixing up two distinct phases of a derivation's build is not a good idea. See
also NixOS#91689 (comment).
  • Loading branch information
Ma27 committed Jul 14, 2020
1 parent a224b6e commit 7713fba
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion pkgs/build-support/rust/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ stdenv.mkDerivation (args // {
-executable ! \( -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" \))
'';

installCheckPhase = args.checkPhase or (let
checkPhase = args.checkPhase or (let
argstr = "${stdenv.lib.optionalString (checkType == "release") "--release"} --target ${rustTarget} --frozen";
in ''
${stdenv.lib.optionalString (buildAndTestSubdir != null) "pushd ${buildAndTestSubdir}"}
Expand Down
4 changes: 1 addition & 3 deletions pkgs/development/tools/rust/rustup/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,7 @@ rustPlatform.buildRustPackage rec {
)
];

# Disable tests until they can be run with --features no-self-update
doCheck = false;
#doCheck = !stdenv.isAarch64 && !stdenv.isDarwin;
doCheck = !stdenv.isAarch64 && !stdenv.isDarwin;

postInstall = ''
pushd $out/bin
Expand Down

0 comments on commit 7713fba

Please sign in to comment.