diff options
| author | Nick Cao <nickcao@nichi.co> | 2024-04-10 20:28:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-10 20:28:46 -0400 |
| commit | 423832b68fbbbaed33e9fb5176574fda37a0a2fa (patch) | |
| tree | 6ad2b6f3e590f0fa88ee8f3bdd1ca93fce065c57 /pkgs | |
| parent | 586066a2233ff4d420f5b8cbb6db6f859132c5ea (diff) | |
| parent | 2a014d6b0afb411acd58b271d95e32d00af1ac79 (diff) | |
Merge pull request #303184 from misuzu/netbird-backport
[Backport release-23.11] netbird: 0.26.0 -> 0.27.2
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/networking/netbird/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index 1ac58d963c0c3..94b353f2014d1 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -31,16 +31,16 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.26.0"; + version = "0.27.2"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - hash = "sha256-hZnxemBoMAol0m9XZPMEh/Lf0woxoLNH97bRyg8xtv4="; + hash = "sha256-W31eKA6v7pAJZ9El/CxEDMONTcpRfzn/Ldh1yIql+NQ="; }; - vendorHash = "sha256-csa83P74Y9fHsPg5VgPfR9WMg4VKOXcIR0pOMzh0QoA="; + vendorHash = "sha256-HJEZ1VrKS1MXKtpDjVorMiecb94+f1mBWPkWng4YqZk="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; @@ -73,9 +73,9 @@ buildGoModule rec { postPatch = '' # make it compatible with systemd's RuntimeDirectory substituteInPlace client/cmd/root.go \ - --replace 'unix:///var/run/netbird.sock' 'unix:///var/run/netbird/sock' + --replace-fail 'unix:///var/run/netbird.sock' 'unix:///var/run/netbird/sock' substituteInPlace client/ui/client_ui.go \ - --replace 'unix:///var/run/netbird.sock' 'unix:///var/run/netbird/sock' + --replace-fail 'unix:///var/run/netbird.sock' 'unix:///var/run/netbird/sock' ''; postInstall = lib.concatStringsSep "\n" @@ -90,13 +90,13 @@ buildGoModule rec { '') modules) + lib.optionalString (stdenv.isLinux && ui) '' mkdir -p $out/share/pixmaps - cp $src/client/ui/netbird-systemtray-default.png $out/share/pixmaps/netbird.png + cp $src/client/ui/netbird-systemtray-connected.png $out/share/pixmaps/netbird.png mkdir -p $out/share/applications cp $src/client/ui/netbird.desktop $out/share/applications/netbird.desktop substituteInPlace $out/share/applications/netbird.desktop \ - --replace "Exec=/usr/bin/netbird-ui" "Exec=$out/bin/netbird-ui" + --replace-fail "Exec=/usr/bin/netbird-ui" "Exec=$out/bin/netbird-ui" ''; passthru = { |