diff options
| author | Andreas Rammhold <andreas@rammhold.de> | 2019-02-25 17:42:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-25 17:42:28 +0100 |
| commit | c3a3ae19617c8396ef034c6a9f14ab4fcb29b13f (patch) | |
| tree | 5f9841dc01bb0eb4672fbceb40858d1b5bb7cf22 | |
| parent | 94b64c27b19acbc4e1f07b0840f916f3a9a67e95 (diff) | |
| parent | 32e94c267449714b67fa062d65e677a468099097 (diff) | |
| download | nixlib-c3a3ae19617c8396ef034c6a9f14ab4fcb29b13f.tar nixlib-c3a3ae19617c8396ef034c6a9f14ab4fcb29b13f.tar.gz nixlib-c3a3ae19617c8396ef034c6a9f14ab4fcb29b13f.tar.bz2 nixlib-c3a3ae19617c8396ef034c6a9f14ab4fcb29b13f.tar.lz nixlib-c3a3ae19617c8396ef034c6a9f14ab4fcb29b13f.tar.xz nixlib-c3a3ae19617c8396ef034c6a9f14ab4fcb29b13f.tar.zst nixlib-c3a3ae19617c8396ef034c6a9f14ab4fcb29b13f.zip | |
Merge pull request #56353 from P-E-Meunier/buildRustCrate
buildRustCrate: adding the description field
| -rw-r--r-- | pkgs/build-support/rust/build-rust-crate/configure-crate.nix | 2 | ||||
| -rw-r--r-- | pkgs/build-support/rust/build-rust-crate/default.nix | 3 |
2 files changed, 4 insertions, 1 deletions
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 700dff8499f9..9f499e4f5e72 100644 --- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -5,6 +5,7 @@ , completeBuildDeps , completeDeps , crateAuthors +, crateDescription , crateFeatures , crateName , crateVersion @@ -69,6 +70,7 @@ in '' export CARGO_PKG_NAME=${crateName} export CARGO_PKG_VERSION=${crateVersion} export CARGO_PKG_AUTHORS="${authors}" + export CARGO_PKG_DESCRIPTION="${crateDescription}" export CARGO_CFG_TARGET_ARCH=${stdenv.hostPlatform.parsed.cpu.name} export CARGO_CFG_TARGET_OS=${target_os} diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index fd7b6ec7ddaf..81e8a7ca0afa 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -129,6 +129,7 @@ stdenv.mkDerivation (rec { build = crate.build or ""; workspace_member = crate.workspace_member or "."; crateVersion = crate.version; + crateDescription = crate.description or ""; crateAuthors = if crate ? authors && lib.isList crate.authors then crate.authors else []; crateType = if lib.attrByPath ["procMacro"] false crate then ["proc-macro"] else @@ -140,7 +141,7 @@ stdenv.mkDerivation (rec { extraRustcOpts = (if crate ? extraRustcOpts then crate.extraRustcOpts else []) ++ extraRustcOpts_ ++ (lib.optional (edition != null) "--edition ${edition}"); configurePhase = configureCrate { - inherit crateName buildDependencies completeDeps completeBuildDeps + inherit crateName buildDependencies completeDeps completeBuildDeps crateDescription crateFeatures libName build workspace_member release libPath crateVersion extraLinkFlags extraRustcOpts crateAuthors verbose colors target_os; |