diff options
| author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2023-06-15 01:26:03 +0200 |
|---|---|---|
| committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2023-06-15 23:55:35 +0200 |
| commit | ddad581c0d9d118dc2f376199ed5f65e44fd5950 (patch) | |
| tree | 6334165d9ad02d3129c9c346b60537af8490f410 /pkgs/build-support | |
| parent | 0138c0f6edc6cc5cdc2f3894a1adc3e0ace4ce1a (diff) | |
| download | nixlib-ddad581c0d9d118dc2f376199ed5f65e44fd5950.tar nixlib-ddad581c0d9d118dc2f376199ed5f65e44fd5950.tar.gz nixlib-ddad581c0d9d118dc2f376199ed5f65e44fd5950.tar.bz2 nixlib-ddad581c0d9d118dc2f376199ed5f65e44fd5950.tar.lz nixlib-ddad581c0d9d118dc2f376199ed5f65e44fd5950.tar.xz nixlib-ddad581c0d9d118dc2f376199ed5f65e44fd5950.tar.zst nixlib-ddad581c0d9d118dc2f376199ed5f65e44fd5950.zip | |
build-rust-crate: cleanup with statix
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 |
2 files changed, 4 insertions, 6 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 37bf3ec26f77..82560012d17b 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 f6079b7316d6..ee96c873f54b 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_ |