diff options
| author | misuzu <bakalolka@gmail.com> | 2024-02-28 10:13:42 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2024-02-28 09:31:52 +0000 |
| commit | eaf0b6152c5cc81f027b659f5b42aab1058d0b6f (patch) | |
| tree | 021134d7fa3ddc15b8df204e35e7fc3114a083c9 | |
| parent | netbird: 0.26.0 -> 0.26.1 (diff) | |
| download | nixpkgs-origin/backport-292028-to-release-23.11.tar.gz | |
netbird-ui: fix build failureorigin/backport-292028-to-release-23.11
(cherry picked from commit 32f9f4626ca38383545e58d4ff58e2ba709e11bc)
| -rw-r--r-- | pkgs/tools/networking/netbird/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index aefad9c33537..8f92c4336a73 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -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 = { |