fix(update): adapted patch to unstable update
All checks were successful
Check meta / check_dns (pull_request) Successful in 16s
Check meta / check_meta (pull_request) Successful in 16s
Check workflows / check_workflows (pull_request) Successful in 31s
Build all the nodes / netaccess01 (pull_request) Successful in 20s
Build all the nodes / ap01 (pull_request) Successful in 1m8s
Build all the nodes / netcore01 (pull_request) Successful in 44s
Build all the nodes / netcore02 (pull_request) Successful in 43s
Build all the nodes / build01 (pull_request) Successful in 1m53s
Build the shell / build-shell (pull_request) Successful in 28s
Build all the nodes / hypervisor01 (pull_request) Successful in 2m12s
Build all the nodes / rescue01 (pull_request) Successful in 2m7s
Run pre-commit on all files / pre-commit (pull_request) Successful in 45s
Build all the nodes / bridge01 (pull_request) Successful in 3m20s
Build all the nodes / web02 (pull_request) Successful in 2m13s
Build all the nodes / web03 (pull_request) Successful in 2m14s
Build all the nodes / web01 (pull_request) Successful in 2m36s
Build all the nodes / geo01 (pull_request) Successful in 3m38s
Build all the nodes / hypervisor03 (pull_request) Successful in 3m32s
Build all the nodes / hypervisor02 (pull_request) Successful in 3m38s
Build all the nodes / geo02 (pull_request) Successful in 3m55s
Build all the nodes / tower01 (pull_request) Successful in 3m33s
Build all the nodes / compute01 (pull_request) Successful in 4m21s
Build all the nodes / storage01 (pull_request) Successful in 3m54s
Build all the nodes / vault01 (pull_request) Successful in 4m10s
Build all the nodes / ap01 (push) Successful in 31s
Build all the nodes / netaccess01 (push) Successful in 20s
Build all the nodes / netcore02 (push) Successful in 42s
Build all the nodes / netcore01 (push) Successful in 48s
Build all the nodes / geo01 (push) Successful in 1m50s
Build the shell / build-shell (push) Successful in 36s
Build all the nodes / hypervisor02 (push) Successful in 1m46s
Run pre-commit on all files / pre-commit (push) Successful in 43s
Build all the nodes / vault01 (push) Successful in 1m53s
Build all the nodes / geo02 (push) Successful in 2m54s
Build all the nodes / hypervisor01 (push) Successful in 2m55s
Build all the nodes / compute01 (push) Successful in 2m59s
Build all the nodes / bridge01 (push) Successful in 3m19s
Build all the nodes / build01 (push) Successful in 3m21s
Build all the nodes / hypervisor03 (push) Successful in 2m53s
Build all the nodes / storage01 (push) Successful in 2m59s
Build all the nodes / rescue01 (push) Successful in 2m59s
Build all the nodes / tower01 (push) Successful in 3m9s
Build all the nodes / web02 (push) Successful in 3m2s
Build all the nodes / web01 (push) Successful in 3m26s
Build all the nodes / web03 (push) Successful in 3m9s

This commit is contained in:
catvayor 2025-02-03 15:03:54 +01:00 committed by thubrecht
parent c27f63b2e2
commit ce66001883

View file

@ -1,21 +1,21 @@
diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix
index 07a1e906dad3..d5799446628b 100644
index 284d79489090..741a5f3bf045 100644
--- a/pkgs/tools/networking/netbird/default.nix
+++ b/pkgs/tools/networking/netbird/default.nix
@@ -26,6 +26,7 @@ let
} else {
client = "netbird";
management = "netbird-mgmt";
+ relay = "netbird-relay";
signal = "netbird-signal";
};
@@ -30,6 +30,7 @@ let
{
client = "netbird";
management = "netbird-mgmt";
+ relay = "netbird-relay";
signal = "netbird-signal";
};
in
@@ -82,7 +83,7 @@ buildGoModule rec {
(lib.mapAttrsToList
(module: binary: ''
mv $out/bin/${lib.last (lib.splitString "/" module)} $out/bin/${binary}
- '' + lib.optionalString (!ui) ''
+ '' + lib.optionalString (!ui && module != "relay") ''
installShellCompletion --cmd ${binary} \
--bash <($out/bin/${binary} completion bash) \
--fish <($out/bin/${binary} completion fish) \
@@ -91,7 +92,7 @@ buildGoModule rec {
''
mv $out/bin/${lib.last (lib.splitString "/" module)} $out/bin/${binary}
''
- + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform && !ui) ''
+ + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform && !ui && module != "relay") ''
installShellCompletion --cmd ${binary} \
--bash <($out/bin/${binary} completion bash) \
--fish <($out/bin/${binary} completion fish) \