From ddad581c0d9d118dc2f376199ed5f65e44fd5950 Mon Sep 17 00:00:00 2001 From: Sandro Jäckel Date: Thu, 15 Jun 2023 01:26:03 +0200 Subject: build-rust-crate: cleanup with statix --- pkgs/build-support/rust/build-rust-crate/build-crate.nix | 6 ++---- pkgs/build-support/rust/build-rust-crate/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'pkgs/build-support') 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_ -- cgit 1.4.1