diff options
| author | figsoda <figsoda@pm.me> | 2023-06-15 21:50:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-15 21:50:47 -0400 |
| commit | d2e921186061dfa127edfc799b1441669b64ebf5 (patch) | |
| tree | 3163564fea52e790d97cf29d87a54c4d18d15c6e /pkgs/build-support | |
| parent | cd5187c6e4df06c26e6a04bb13459f64485238aa (diff) | |
| parent | 9a6ee48a3de1a0623d4f6b79d53e99b2da1ad38f (diff) | |
| download | nixpkgs-d2e921186061dfa127edfc799b1441669b64ebf5.tar nixpkgs-d2e921186061dfa127edfc799b1441669b64ebf5.tar.gz nixpkgs-d2e921186061dfa127edfc799b1441669b64ebf5.tar.bz2 nixpkgs-d2e921186061dfa127edfc799b1441669b64ebf5.tar.lz nixpkgs-d2e921186061dfa127edfc799b1441669b64ebf5.tar.xz nixpkgs-d2e921186061dfa127edfc799b1441669b64ebf5.tar.zst nixpkgs-d2e921186061dfa127edfc799b1441669b64ebf5.zip | |
Merge pull request #237848 from SuperSandro2000/build-rust
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/rust/build-rust-crate/build-crate.nix | 6 | ||||
| -rw-r--r-- | pkgs/build-support/rust/build-rust-crate/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/build-support/rust/build-rust-package/default.nix | 1 |
3 files changed, 4 insertions, 7 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 37bf3ec26f7..82560012d17 100644 --- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -7,7 +7,7 @@ dependencies, crateFeatures, crateRenames, libName, release, libPath, crateType, metadata, crateBin, hasCrateBin, - extraRustcOpts, verbose, colors, + extraRustcOpts, buildTests, codegenUnits }: @@ -40,9 +40,7 @@ ++ (map (x: "--crate-type ${x}") crateType) ); - binRustcOpts = lib.concatStringsSep " " ( - baseRustcOpts - ); + binRustcOpts = lib.concatStringsSep " " baseRustcOpts; build_bin = if buildTests then "build_bin_test" else "build_bin"; in '' diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index f6079b7316d..ee96c873f54 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -300,7 +300,7 @@ crate_: lib.makeOverridable (crate.features ++ features) ); - libName = if crate ? libName then crate.libName else crate.crateName; + libName = crate.libName or crate.crateName; libPath = lib.optionalString (crate ? libPath) crate.libPath; # Seed the symbol hashes with something unique every time. @@ -329,7 +329,7 @@ crate_: lib.makeOverridable colors = lib.attrByPath [ "colors" ] "always" crate; extraLinkFlags = lib.concatStringsSep " " (crate.extraLinkFlags or [ ]); edition = crate.edition or null; - codegenUnits = if crate ? codegenUnits then crate.codegenUnits else 1; + codegenUnits = crate.codegenUnits or 1; extraRustcOpts = lib.optionals (crate ? extraRustcOpts) crate.extraRustcOpts ++ extraRustcOpts_ diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix index aa620132c1a..39d3eb8e650 100644 --- a/pkgs/build-support/rust/build-rust-package/default.nix +++ b/pkgs/build-support/rust/build-rust-package/default.nix @@ -34,7 +34,6 @@ , buildInputs ? [] , nativeBuildInputs ? [] , cargoUpdateHook ? "" -, cargoDepsHook ? "" , buildType ? "release" , meta ? {} , cargoLock ? null |