Revert "buildRustPackage: fix cargoBuildFlags"

This reverts commit deb78151a9.

Mixing up two distinct phases of a derivation's build is not a good idea. See
also https://github.com/NixOS/nixpkgs/pull/91689#issuecomment-657813954.
This commit is contained in:
Maximilian Bosch 2020-07-14 14:39:13 +02:00
parent a224b6e18f
commit 7713fba8f8
No known key found for this signature in database
GPG key ID: 091DBF4D1FC46B8E
2 changed files with 2 additions and 4 deletions

View file

@ -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}"}

View file

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