From ce660018833c015b7e27468cd0ae2883fd7855ec Mon Sep 17 00:00:00 2001 From: catvayor Date: Mon, 3 Feb 2025 15:03:54 +0100 Subject: [PATCH] fix(update): adapted patch to unstable update --- patches/nixpkgs/05-netbird-relay.patch | 34 +++++++++++++------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/patches/nixpkgs/05-netbird-relay.patch b/patches/nixpkgs/05-netbird-relay.patch index 1b93876..91cf1dd 100644 --- a/patches/nixpkgs/05-netbird-relay.patch +++ b/patches/nixpkgs/05-netbird-relay.patch @@ -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) \