Unverified Commit f9d06580 authored by Jonas Heinrich's avatar Jonas Heinrich Committed by GitHub
Browse files

Merge pull request #259860 from marsam/opensnitch-buildGo121Module 

opensnitch: use buildGo121Module
parents e189e9c0 69ebb043

pkgs/tools/networking/opensnitch/daemon.nix

+7 −0
Original line number Diff line number Diff line
@@ -27,6 +27,11 @@ buildGoModule rec { 
    hash = "sha256-C8Uuz2FC7Zu07ZmFpp+ejpNxkyC3/mM9J2dc5FUKx64=";

  };



  postPatch = ''

    # Allow configuring Version at build time

    substituteInPlace daemon/core/version.go --replace "const " "var "

  '';



  modRoot = "daemon";



  buildInputs = [
@@ -65,6 +70,8 @@ buildGoModule rec { 
      --replace "/bin/mkdir" "${coreutils}/bin/mkdir"

  '';



  ldflags = [ "-s" "-w" "-X github.com/evilsocket/opensnitch/daemon/core.Version=${version}" ];



  postInstall = ''

    wrapProgram $out/bin/opensnitchd \

      --prefix PATH : ${lib.makeBinPath [ iptables ]}

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -11494,9 +11494,7 @@ with pkgs; 
  openfortivpn = callPackage ../tools/networking/openfortivpn { };















  opensnitch = callPackage ../tools/networking/opensnitch/daemon.nix {













    # Build currently fails on Go > 1.18













    # See https://github.com/evilsocket/opensnitch/issues/851













    buildGoModule = buildGo118Module;













    buildGoModule = buildGo121Module;















  };





























  opensnitch-ui = libsForQt5.callPackage ../tools/networking/opensnitch/ui.nix { };