From 91ebc2d517bdee91f3909d8abe2c1288105de223 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Fri, 21 Aug 2020 22:36:06 +0200 Subject: [PATCH] netns-exec: simplify installation --- modules/netns-isolation.nix | 2 +- pkgs/netns-exec/default.nix | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/netns-isolation.nix b/modules/netns-isolation.nix index 5a19914..81acfc5 100644 --- a/modules/netns-isolation.nix +++ b/modules/netns-isolation.nix @@ -101,7 +101,7 @@ in { boot.kernel.sysctl."net.ipv4.ip_forward" = true; security.wrappers.netns-exec = { - source = "${pkgs.nix-bitcoin.netns-exec}/netns-exec"; + source = pkgs.nix-bitcoin.netns-exec; capabilities = "cap_sys_admin=ep"; owner = cfg.allowedUser; permissions = "u+rx,g+rx,o-rwx"; diff --git a/pkgs/netns-exec/default.nix b/pkgs/netns-exec/default.nix index bafd516..5998549 100644 --- a/pkgs/netns-exec/default.nix +++ b/pkgs/netns-exec/default.nix @@ -5,7 +5,6 @@ stdenv.mkDerivation { buildInputs = [ pkgs.libcap ]; src = ./src; installPhase = '' - mkdir -p $out - cp main $out/netns-exec + cp main $out ''; }