Skip to content

Commit

Permalink
Merge pull request #303184 from misuzu/netbird-backport
Browse files Browse the repository at this point in the history
[Backport release-23.11] netbird: 0.26.0 -> 0.27.2
  • Loading branch information
NickCao authored Apr 11, 2024
2 parents 586066a + 2a014d6 commit 423832b
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions pkgs/tools/networking/netbird/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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"
Expand All @@ -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 = {
Expand Down

0 comments on commit 423832b

Please sign in to comment.