public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buildRustCrate: Allow arbitrary attributes in crateOverrides

Browse Source
This commit is contained in:
Andrew Childs 2018-01-18 00:00:20 +09:00
parent d02d062c9b
commit 62dcb3d5d0
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/build-support/rust/build-rust-crate.nix
View File

@ -297,9 +297,15 @@ in
crate_: lib.makeOverridable ({ rust, release, verbose, features, buildInputs, crateOverrides }: crate_: lib.makeOverridable ({ rust, release, verbose, features, buildInputs, crateOverrides }:
let crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: {}) crateOverrides crate_); let crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: {}) crateOverrides crate_);
processedAttrs = [
"src" "buildInputs" "crateBin" "crateLib" "libName" "libPath"
"buildDependencies" "dependencies" "features"
"crateName" "version" "build" "authors" "colors"
];
extraDerivationAttrs = lib.filterAttrs (n: v: ! lib.elem n processedAttrs) crate;
buildInputs_ = buildInputs; buildInputs_ = buildInputs;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation (rec {
inherit (crate) crateName; inherit (crate) crateName;
@ -372,7 +378,7 @@ stdenv.mkDerivation rec {
}; };
installPhase = installCrate crateName; installPhase = installCrate crateName;
}) { } // extraDerivationAttrs)) {
rust = rustc; rust = rustc;
release = true; release = true;
verbose = true; verbose = true;