buildRustPackage: handle cargoBuildFlags in cargoBuildHook

2021-02-15 12:08:06 +01:00
parent 05e40e79a8
commit 087ab3db9c
2 changed files with 2 additions and 3 deletions
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -36,7 +36,6 @@
 , nativeBuildInputs ? []
 , cargoUpdateHook ? ""
 , cargoDepsHook ? ""
-, cargoBuildFlags ? []
 , buildType ? "release"
 , meta ? {}
 , cargoVendorDir ? null
@@ -98,8 +97,6 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // lib.optionalAttrs u
 } // {
  inherit buildAndTestSubdir cargoDeps;

-  cargoBuildFlags = lib.concatStringsSep " " cargoBuildFlags;
-
  cargoBuildType = buildType;

  patchRegistryDeps = ./patch-registry-deps;
--- a/pkgs/build-support/rust/hooks/cargo-build-hook.sh
+++ b/pkgs/build-support/rust/hooks/cargo-build-hook.sh
@@ -1,3 +1,5 @@
+declare -a cargoBuildFlags
+
 cargoBuildHook() {
    echo "Executing cargoBuildHook"