From 087ab3db9cd2a597700e438ae1d0fbe90c1e3fd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Mon, 15 Feb 2021 12:08:06 +0100
Subject: [PATCH] buildRustPackage: handle cargoBuildFlags in cargoBuildHook

---
 pkgs/build-support/rust/default.nix               | 3 ---
 pkgs/build-support/rust/hooks/cargo-build-hook.sh | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 760f7c920da..a7bd296d673 100644
--- 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;
diff --git a/pkgs/build-support/rust/hooks/cargo-build-hook.sh b/pkgs/build-support/rust/hooks/cargo-build-hook.sh
index 85a3827dc10..54f4512d67c 100644
--- 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"