summary refs log tree commit diff
path: root/pkgs/tools/networking/opensnitch/daemon.nix
diff options
context:
space:
mode:
authorJonas Heinrich <onny@project-insanity.org>2021-12-04 18:35:35 +0100
committerJonas Heinrich <onny@project-insanity.org>2021-12-14 21:38:36 +0100
commit08ff63587b58139279e3069ebb7001d6c3acdfcd (patch)
tree6a6386aa0e9df6cf8d71cf4fe025deb0683c349d /pkgs/tools/networking/opensnitch/daemon.nix
parentfc58c3761e9b9b3aee635bb2894bab97aa1b6ff6 (diff)
downloadnixpkgs-08ff63587b58139279e3069ebb7001d6c3acdfcd.tar
nixpkgs-08ff63587b58139279e3069ebb7001d6c3acdfcd.tar.gz
nixpkgs-08ff63587b58139279e3069ebb7001d6c3acdfcd.tar.bz2
nixpkgs-08ff63587b58139279e3069ebb7001d6c3acdfcd.tar.lz
nixpkgs-08ff63587b58139279e3069ebb7001d6c3acdfcd.tar.xz
nixpkgs-08ff63587b58139279e3069ebb7001d6c3acdfcd.tar.zst
nixpkgs-08ff63587b58139279e3069ebb7001d6c3acdfcd.zip
opensnitch, opensnitch-ui: 1.3.6 > 1.4.3
Diffstat (limited to 'pkgs/tools/networking/opensnitch/daemon.nix')
-rw-r--r--pkgs/tools/networking/opensnitch/daemon.nix18
1 files changed, 13 insertions, 5 deletions
diff --git a/pkgs/tools/networking/opensnitch/daemon.nix b/pkgs/tools/networking/opensnitch/daemon.nix
index 2ebf9425f0e..27d3a6ce518 100644
--- a/pkgs/tools/networking/opensnitch/daemon.nix
+++ b/pkgs/tools/networking/opensnitch/daemon.nix
@@ -1,6 +1,8 @@
 { buildGoModule
 , fetchFromGitHub
 , fetchpatch
+, protobuf
+, go-protobuf
 , pkg-config
 , libnetfilter_queue
 , libnfnetlink
@@ -12,13 +14,13 @@
 
 buildGoModule rec {
   pname = "opensnitch";
-  version = "1.3.6";
+  version = "1.4.3";
 
   src = fetchFromGitHub {
     owner = "evilsocket";
     repo = "opensnitch";
     rev = "v${version}";
-    sha256 = "sha256-Cgo+bVQQeUZuYYhA1WSqlLyQQGAeXbbNno9LS7oNvhI=";
+    sha256 = "1c2v2x8hfqk524sa42vry74lda4lg6ii40ljk2qx9j2f69446sva";
   };
 
   patches = [
@@ -29,15 +31,21 @@ buildGoModule rec {
       url = "https://github.com/evilsocket/opensnitch/commit/8a3f63f36aa92658217bbbf46d39e6d20b2c0791.patch";
       sha256 = "sha256-WkwjKTQZppR0nqvRO4xiQoKZ307NvuUwoRx+boIpuTg=";
     })
+    # Upstream has inconsistent vendoring
+    ./go-mod.patch
   ];
 
   modRoot = "daemon";
 
-  vendorSha256 = "sha256-LMwQBFkHg1sWIUITLOX2FZi5QUfOivvrkcl9ELO3Trk=";
+  buildInputs = [ libnetfilter_queue libnfnetlink ];
 
-  nativeBuildInputs = [ pkg-config makeWrapper ];
+  nativeBuildInputs = [ pkg-config protobuf go-protobuf makeWrapper ];
 
-  buildInputs = [ libnetfilter_queue libnfnetlink ];
+  vendorSha256 = "sha256-sTfRfsvyiFk1bcga009W6jD6RllrySRAU6B/8mF6+ow=";
+
+  preBuild = ''
+    make -C ../proto ../daemon/ui/protocol/ui.pb.go
+  '';
 
   postBuild = ''
     mv $GOPATH/bin/daemon $GOPATH/bin/opensnitchd