From a05790a5bfb79e1284f00101d14f1c7da2c3a973 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 10 Dec 2021 10:46:43 +0100 Subject: [PATCH 1/2] opensnitch: fix daemon cant find iptables in PATH --- pkgs/tools/networking/opensnitch/daemon.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/opensnitch/daemon.nix b/pkgs/tools/networking/opensnitch/daemon.nix index 31057a8f5271..b15670474ef3 100644 --- a/pkgs/tools/networking/opensnitch/daemon.nix +++ b/pkgs/tools/networking/opensnitch/daemon.nix @@ -7,6 +7,7 @@ , lib , coreutils , iptables +, makeWrapper }: buildGoModule rec { @@ -32,21 +33,25 @@ buildGoModule rec { modRoot = "daemon"; + vendorSha256 = "sha256-LMwQBFkHg1sWIUITLOX2FZi5QUfOivvrkcl9ELO3Trk="; + + nativeBuildInputs = [ pkg-config makeWrapper ]; + + buildInputs = [ libnetfilter_queue libnfnetlink ]; + postBuild = '' mv $GOPATH/bin/daemon $GOPATH/bin/opensnitchd mkdir -p $out/lib/systemd/system substitute opensnitchd.service $out/lib/systemd/system/opensnitchd.service \ - --replace "/usr/local/bin/opensnitchd" "$out/bin/opensnitchd" \ + --replace "/usr/local/bin/opensnitchd" "${out}/bin/opensnitchd" \ --replace "/etc/opensnitchd/rules" "/var/lib/opensnitch/rules" \ --replace "/bin/mkdir" "${coreutils}/bin/mkdir" - sed -i '/\[Service\]/a Environment=PATH=${iptables}/bin' $out/lib/systemd/system/opensnitchd.service ''; - vendorSha256 = "sha256-LMwQBFkHg1sWIUITLOX2FZi5QUfOivvrkcl9ELO3Trk="; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ libnetfilter_queue libnfnetlink ]; + postInstall = '' + wrapProgram $out/bin/opensnitchd \ + --prefix PATH : ${lib.makeBinPath [ iptables ]} + ''; meta = with lib; { description = "An application firewall"; From 4d6cb6b4c8ebc35d848fe0ef5cda1ce5fcd6e072 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 10 Dec 2021 11:00:25 +0100 Subject: [PATCH 2/2] opensnitch: fix daemon cant find iptables in PATH --- pkgs/tools/networking/opensnitch/daemon.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/opensnitch/daemon.nix b/pkgs/tools/networking/opensnitch/daemon.nix index b15670474ef3..2ebf9425f0e5 100644 --- a/pkgs/tools/networking/opensnitch/daemon.nix +++ b/pkgs/tools/networking/opensnitch/daemon.nix @@ -43,7 +43,7 @@ buildGoModule rec { mv $GOPATH/bin/daemon $GOPATH/bin/opensnitchd mkdir -p $out/lib/systemd/system substitute opensnitchd.service $out/lib/systemd/system/opensnitchd.service \ - --replace "/usr/local/bin/opensnitchd" "${out}/bin/opensnitchd" \ + --replace "/usr/local/bin/opensnitchd" "$out/bin/opensnitchd" \ --replace "/etc/opensnitchd/rules" "/var/lib/opensnitch/rules" \ --replace "/bin/mkdir" "${coreutils}/bin/mkdir" '';