diff options
| author | Peter Hoeg <peter@hoeg.com> | 2018-10-23 16:57:28 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-23 16:57:28 +0800 |
| commit | a080e0a424aaf4981505df151f8b98b2d617821e (patch) | |
| tree | 898ebbf270f013ec1698af92138a112b301f6ee3 /pkgs/os-specific | |
| parent | fd9b525d88877045068ba28021ed9fa64f3a8c48 (diff) | |
| parent | 04bbb2ab6b7faf595e60fedc4da2cd5010d0d616 (diff) | |
| download | nixlib-a080e0a424aaf4981505df151f8b98b2d617821e.tar nixlib-a080e0a424aaf4981505df151f8b98b2d617821e.tar.gz nixlib-a080e0a424aaf4981505df151f8b98b2d617821e.tar.bz2 nixlib-a080e0a424aaf4981505df151f8b98b2d617821e.tar.lz nixlib-a080e0a424aaf4981505df151f8b98b2d617821e.tar.xz nixlib-a080e0a424aaf4981505df151f8b98b2d617821e.tar.zst nixlib-a080e0a424aaf4981505df151f8b98b2d617821e.zip | |
Merge pull request #47718 from peterhoeg/f/fj
firejail: override files should be in /etc/firejail
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/firejail/default.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index 568e474f444a..553b3804a038 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -37,6 +37,14 @@ stdenv.mkDerivation { sed -e "s@/etc/@$out/etc/@g" -e "/chmod u+s/d" -i Makefile ''; + # We need to set the directory for the .local override files back to + # /etc/firejail so we can actually override them + postInstall = '' + sed -E -e 's@^include (.*)(/firejail/.*.local)$@include /etc\2@g' -i $out/etc/firejail/*.profile + ''; + + enableParallelBuilding = true; + meta = { inherit (s) version; description = ''Namespace-based sandboxing tool for Linux''; |