From 12437967ee8ca9a96576eb9e33462381e8913266 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Mon, 4 Nov 2024 21:02:12 +0100 Subject: [PATCH 1/2] vector: readd missing mig command on darwin https://hydra.nixos.org/build/277167788 --- pkgs/tools/misc/vector/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 19b25edf65d2..8ba2543ac1bd 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -22,6 +22,7 @@ git, nixosTests, nix-update-script, + darwin, }: let @@ -57,7 +58,9 @@ rustPlatform.buildRustPackage { perl git rustPlatform.bindgenHook - ]; + ] + # Provides the mig command used by the build scripts + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.bootstrap_cmds; buildInputs = [ oniguruma From 476d7434dea6ed1404b425cfdc5034916894f010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Tue, 5 Nov 2024 07:54:32 +0100 Subject: [PATCH 2/2] vector: format with nixfmt-rfc-style --- pkgs/tools/misc/vector/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 8ba2543ac1bd..cdb6f42db918 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -52,13 +52,14 @@ rustPlatform.buildRustPackage { }; }; - nativeBuildInputs = [ - pkg-config - cmake - perl - git - rustPlatform.bindgenHook - ] + nativeBuildInputs = + [ + pkg-config + cmake + perl + git + rustPlatform.bindgenHook + ] # Provides the mig command used by the build scripts ++ lib.optional stdenv.hostPlatform.isDarwin darwin.bootstrap_cmds; buildInputs =