diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2020-07-14 14:39:13 +0200 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2020-07-14 17:39:09 +0200 |
| commit | 7713fba8f89a15fd0413ea61b98880e90a978eec (patch) | |
| tree | 6f5e94089960a869f2a9656a65723ca6972112cc /pkgs/build-support | |
| parent | a224b6e18fa7fc17b0143dfe05aeadc89f3e62ca (diff) | |
| download | nixpkgs-7713fba8f89a15fd0413ea61b98880e90a978eec.tar nixpkgs-7713fba8f89a15fd0413ea61b98880e90a978eec.tar.gz nixpkgs-7713fba8f89a15fd0413ea61b98880e90a978eec.tar.bz2 nixpkgs-7713fba8f89a15fd0413ea61b98880e90a978eec.tar.lz nixpkgs-7713fba8f89a15fd0413ea61b98880e90a978eec.tar.xz nixpkgs-7713fba8f89a15fd0413ea61b98880e90a978eec.tar.zst nixpkgs-7713fba8f89a15fd0413ea61b98880e90a978eec.zip | |
Revert "buildRustPackage: fix cargoBuildFlags"
This reverts commit deb78151a9438fb202842d9dbe348365cfd767e0. 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.
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/rust/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 9e9f2cb4e3b..8d3a7ba6929 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -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}"} |