cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #292028 from misuzu/netbird-update

Browse source 
netbird: 0.26.0 -> 0.26.1
This commit is contained in:
Jon Seager 2024-02-28 09:00:57 +00:00 committed by GitHub
commit d852b9fdd7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/tools/networking/netbird/default.nix
View file

@ -31,16 +31,16 @@ let
in in
buildGoModule rec { buildGoModule rec {
pname = "netbird"; pname = "netbird";
version = "0.26.0"; version = "0.26.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "netbirdio"; owner = "netbirdio";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-hZnxemBoMAol0m9XZPMEh/Lf0woxoLNH97bRyg8xtv4="; hash = "sha256-FZ6bPn4birCjvWm43clu3lAES38IooLP7PhUfRMO5+0=";
}; };
vendorHash = "sha256-csa83P74Y9fHsPg5VgPfR9WMg4VKOXcIR0pOMzh0QoA="; vendorHash = "sha256-Zp8LAaADpSa/wfnLAQVJ8cG3bMkC7ZU1BT+Dz214c34=";
nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config;
@ -73,9 +73,9 @@ buildGoModule rec {
postPatch = '' postPatch = ''
# make it compatible with systemd's RuntimeDirectory # make it compatible with systemd's RuntimeDirectory
substituteInPlace client/cmd/root.go \ 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 \ 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" postInstall = lib.concatStringsSep "\n"
@ -90,13 +90,13 @@ buildGoModule rec {
'') '')
modules) + lib.optionalString (stdenv.isLinux && ui) '' modules) + lib.optionalString (stdenv.isLinux && ui) ''
mkdir -p $out/share/pixmaps 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 mkdir -p $out/share/applications
cp $src/client/ui/netbird.desktop $out/share/applications/netbird.desktop cp $src/client/ui/netbird.desktop $out/share/applications/netbird.desktop
substituteInPlace $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 = { passthru = {