diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2021-07-14 15:45:51 +0200 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2021-07-14 15:45:51 +0200 |
| commit | 7afa51c2bdc6eed033e4b6fb6ebb79ec05b4e3f0 (patch) | |
| tree | d3194cbefa12c70bced6fbaf17346ba63554e1ec /pkgs/build-support | |
| parent | 266cb48e6549ecec997b929c22b77006dcc250cb (diff) | |
| parent | 1ee2dd6dd3fdc3c7e2cced7a3295c9b3a274610d (diff) | |
| download | nixpkgs-7afa51c2bdc6eed033e4b6fb6ebb79ec05b4e3f0.tar nixpkgs-7afa51c2bdc6eed033e4b6fb6ebb79ec05b4e3f0.tar.gz nixpkgs-7afa51c2bdc6eed033e4b6fb6ebb79ec05b4e3f0.tar.bz2 nixpkgs-7afa51c2bdc6eed033e4b6fb6ebb79ec05b4e3f0.tar.lz nixpkgs-7afa51c2bdc6eed033e4b6fb6ebb79ec05b4e3f0.tar.xz nixpkgs-7afa51c2bdc6eed033e4b6fb6ebb79ec05b4e3f0.tar.zst nixpkgs-7afa51c2bdc6eed033e4b6fb6ebb79ec05b4e3f0.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/rust/build-rust-crate/build-crate.nix | 1 | ||||
| -rw-r--r-- | pkgs/build-support/rust/build-rust-crate/configure-crate.nix | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix index df3129d536d..3441e2c5e7b 100644 --- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -12,7 +12,6 @@ [ (if release then "-C opt-level=3" else "-C debuginfo=2") "-C codegen-units=$NIX_BUILD_CORES" - "-C incremental=no" "--remap-path-prefix=$NIX_BUILD_TOP=/" (mkRustcDepArgs dependencies crateRenames) (mkRustcFeatureArgs crateFeatures) diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index 3eaba1736fc..d1010ac1adb 100644 --- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -24,7 +24,7 @@ let version_ = lib.splitString "-" crateVersion; version = lib.splitVersion (lib.head version_); rustcOpts = lib.foldl' (opts: opt: opts + " " + opt) (if release then "-C opt-level=3" else "-C debuginfo=2") - (["-C codegen-units=$NIX_BUILD_CORES -C incremental=no"] ++ extraRustcOpts); + (["-C codegen-units=$NIX_BUILD_CORES"] ++ extraRustcOpts); buildDeps = mkRustcDepArgs buildDependencies crateRenames; authors = lib.concatStringsSep ":" crateAuthors; optLevel = if release then 3 else 0; |