diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-13 16:08:59 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-13 16:08:59 +0100 |
| commit | ed1b0d0bac6438fbfcb2dca77493edcbe3384114 (patch) | |
| tree | d9ddecb505723c8c45ca2837e08e121f41b49fd2 /pkgs/os-specific/linux/firejail | |
| parent | 960f062825d22e328828766f4910b702f81ddade (diff) | |
| parent | de66fc6a2a2483f4bbbb759c55176643df6e38ba (diff) | |
| download | nixpkgs-ed1b0d0bac6438fbfcb2dca77493edcbe3384114.tar nixpkgs-ed1b0d0bac6438fbfcb2dca77493edcbe3384114.tar.gz nixpkgs-ed1b0d0bac6438fbfcb2dca77493edcbe3384114.tar.bz2 nixpkgs-ed1b0d0bac6438fbfcb2dca77493edcbe3384114.tar.lz nixpkgs-ed1b0d0bac6438fbfcb2dca77493edcbe3384114.tar.xz nixpkgs-ed1b0d0bac6438fbfcb2dca77493edcbe3384114.tar.zst nixpkgs-ed1b0d0bac6438fbfcb2dca77493edcbe3384114.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific/linux/firejail')
| -rw-r--r-- | pkgs/os-specific/linux/firejail/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index 28528f48efb..8200acf62b7 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -36,10 +36,10 @@ 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 + # We need to set the directory for the .local override files 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 + sed -E -e 's@^include (.*.local)$@include /etc/firejail/\1@g' -i $out/etc/firejail/*.profile ''; # At high parallelism, the build sometimes fails with: |