Unverified Commit d852b9fd authored by Jon Seager's avatar Jon Seager Committed by GitHub
Browse files

Merge pull request #292028 from misuzu/netbird-update 

netbird: 0.26.0 -> 0.26.1
parents 8bedcad9 32f9f462

pkgs/tools/networking/netbird/default.nix

+7 −7
Original line number Diff line number Diff line
@@ -31,16 +31,16 @@ let 
in

buildGoModule rec {

  pname = "netbird";

  version = "0.26.0";

  version = "0.26.1";



  src = fetchFromGitHub {

    owner = "netbirdio";

    repo = pname;

    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;
@@ -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 = {