From f8602fa508510f77d41b3d71e85fd682a0e5c8c4 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sun, 18 Jun 2023 09:27:44 +0000 Subject: Revert "build-rust-{crate,package}: cleanups" --- pkgs/build-support/rust/build-rust-crate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/build-support/rust/build-rust-crate/default.nix') diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index ee96c873f54b..f6079b7316d6 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 = crate.libName or crate.crateName; + libName = if crate ? libName then crate.libName else 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 = crate.codegenUnits or 1; + codegenUnits = if crate ? codegenUnits then crate.codegenUnits else 1; extraRustcOpts = lib.optionals (crate ? extraRustcOpts) crate.extraRustcOpts ++ extraRustcOpts_ -- cgit 1.4.1