aboutsummaryrefslogtreecommitdiff
path: root/pkgs/build-support/rust
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2020-09-23 06:01:05 -0400
committerShea Levy <shea@shealevy.com>2020-09-23 06:01:05 -0400
commitb694eb6e6a0e27c159345ac9651f80ed28fe1a2f (patch)
tree253a9ea79603567c9bcff3c2fda8894b6bb4d445 /pkgs/build-support/rust
parentf43c02c7ff649a0594937b5b99c4276d9d89b61f (diff)
firmware-manager: Init at 0.1.1
Diffstat (limited to 'pkgs/build-support/rust')
-rw-r--r--pkgs/build-support/rust/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 23fb56539e45..0103e064828b 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -29,7 +29,7 @@
, target ? null
, cargoVendorDir ? null
, checkType ? buildType
-
+, depsExtraArgs ? {}
# Needed to `pushd`/`popd` into a subdir of a tarball if this subdir
# contains a Cargo.toml, but isn't part of a workspace (which is e.g. the
# case for `rustfmt`/etc from the `rust-sources).
@@ -43,11 +43,11 @@ assert buildType == "release" || buildType == "debug";
let
cargoDeps = if cargoVendorDir == null
- then fetchCargoTarball {
+ then fetchCargoTarball ({
inherit name src srcs sourceRoot unpackPhase cargoUpdateHook;
patches = cargoPatches;
sha256 = cargoSha256;
- }
+ } // depsExtraArgs)
else null;
# If we have a cargoSha256 fixed-output derivation, validate it at build time
@@ -83,7 +83,7 @@ let
in
-stdenv.mkDerivation (args // {
+stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // {
inherit cargoDeps;
patchRegistryDeps = ./patch-registry-deps;