pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #274440 from bouk/missing-build-rust-env

build-rust-crate: add missing CARGO_PKG env variables

authored by Ryan Lahfa and committed by GitHub ec84d47f 58c2a31a

+22 -4
unified split
+14 -2
pkgs/build-support/rust/build-rust-crate/configure-crate.nix
··· 7 7 , completeBuildDeps 8 8 , completeDeps 9 9 , crateAuthors 10 - , crateLinks 11 10 , crateDescription 11 + , crateFeatures 12 12 , crateHomepage 13 - , crateFeatures 13 + , crateLicense 14 + , crateLicenseFile 15 + , crateLinks 14 16 , crateName 17 + , crateReadme 15 18 , crateRenames 19 + , crateRepository 20 + , crateRustVersion 16 21 , crateVersion 17 22 , extraLinkFlags 18 23 , extraRustcOptsForBuildRs ··· 120 125 121 126 EXTRA_BUILD="" 122 127 BUILD_OUT_DIR="" 128 + 129 + # Set up Cargo Environment variables: https://doc.rust-lang.org/cargo/reference/environment-variables.html 123 130 export CARGO_PKG_NAME=${crateName} 124 131 export CARGO_PKG_VERSION=${crateVersion} 125 132 export CARGO_PKG_AUTHORS="${authors}" ··· 147 154 export CARGO_PKG_VERSION_PATCH=${lib.elemAt version 2} 148 155 export CARGO_PKG_VERSION_PRE="${versionPre}" 149 156 export CARGO_PKG_HOMEPAGE="${crateHomepage}" 157 + export CARGO_PKG_LICENSE="${crateLicense}" 158 + export CARGO_PKG_LICENSE_FILE="${crateLicenseFile}" 159 + export CARGO_PKG_README="${crateReadme}" 160 + export CARGO_PKG_REPOSITORY="${crateRepository}" 161 + export CARGO_PKG_RUST_VERSION="${crateRustVersion}" 150 162 export NUM_JOBS=$NIX_BUILD_CORES 151 163 export RUSTC="rustc" 152 164 export RUSTDOC="rustdoc"
+8 -2
pkgs/build-support/rust/build-rust-crate/default.nix
··· 314 314 # Either set to a concrete sub path to the crate root 315 315 # or use `null` for auto-detect. 316 316 workspace_member = crate.workspace_member or "."; 317 - crateVersion = crate.version; 317 + crateAuthors = if crate ? authors && lib.isList crate.authors then crate.authors else [ ]; 318 318 crateDescription = crate.description or ""; 319 - crateAuthors = if crate ? authors && lib.isList crate.authors then crate.authors else [ ]; 320 319 crateHomepage = crate.homepage or ""; 320 + crateLicense = crate.license or ""; 321 + crateLicenseFile = crate.license-file or ""; 321 322 crateLinks = crate.links or ""; 323 + crateReadme = crate.readme or ""; 324 + crateRepository = crate.repository or ""; 325 + crateRustVersion = crate.rust-version or ""; 326 + crateVersion = crate.version; 322 327 crateType = 323 328 if lib.attrByPath [ "procMacro" ] false crate then [ "proc-macro" ] else 324 329 if lib.attrByPath [ "plugin" ] false crate then [ "dylib" ] else ··· 341 346 inherit crateName buildDependencies completeDeps completeBuildDeps crateDescription 342 347 crateFeatures crateRenames libName build workspace_member release libPath crateVersion crateLinks 343 348 extraLinkFlags extraRustcOptsForBuildRs 349 + crateLicense crateLicenseFile crateReadme crateRepository crateRustVersion 344 350 crateAuthors crateHomepage verbose colors codegenUnits; 345 351 }; 346 352 buildPhase = buildCrate {