From fdfbb4671ebbe47771261417ee69ad2957003d2e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 2 Dec 2019 21:24:40 +0000 Subject: [PATCH] rustPlatform: forward unpackPhase to fetchcargo If a custom unpackPhase is used for the package, it needs to also be used for fetchcargo so the same source is available for vendoring. --- pkgs/build-support/rust/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 1d8e4448674..f9cf8f1f0c1 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -4,6 +4,7 @@ , cargoSha256 ? "unset" , src ? null , srcs ? null +, unpackPhase ? null , cargoPatches ? [] , patches ? [] , sourceRoot ? null @@ -29,7 +30,7 @@ assert buildType == "release" || buildType == "debug"; let cargoDeps = if cargoVendorDir == null then fetchcargo { - inherit name src srcs sourceRoot cargoUpdateHook; + inherit name src srcs sourceRoot unpackPhase cargoUpdateHook; copyLockfile = verifyCargoDeps; patches = cargoPatches; sha256 = cargoSha256;