Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 502c16e591fb
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 20e74c9868ab
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 11, 2020

  1. firejail: local profile handling fixed 

    The sed expression wasn't really catching anything (as local profiles are
included in the provided set of profiles by `include aaa.local` and not by
`include xx/firejail/aaa.local` as the sed expression used to expect).
As a result, it was not possible to create local profiles in any
accessible location. This fix makes it possible to create them in
`/etc/firejail/` which seems pretty standard.
    @snicket2100
    snicket2100 committed Jan 11, 2020
    Copy the full SHA
    0778f0a View commit details

Commits on Jan 12, 2020

  1. Merge pull request #77524 from snicket2100/firejail-local-profiles-fixed 

    firejail: local profile handling fixed
    @7c6f434c
    7c6f434c authored Jan 12, 2020
    Copy the full SHA
    20e74c9 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/os-specific/linux/firejail/default.nix
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/firejail/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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: