summary refs log tree commit diff
path: root/pkgs/os-specific/linux/firejail/default.nix
diff options
context:
space:
mode:
authorJonas Heinrich <onny@project-insanity.org>2022-05-06 14:05:35 +0200
committerJonas Heinrich <onny@project-insanity.org>2022-05-07 11:39:02 +0200
commit5d2dfa253eaf9092bfc10695e40b2c80371dd55c (patch)
treeee84f102f528b17a14a4562f66154646c99d0a26 /pkgs/os-specific/linux/firejail/default.nix
parentf678ad7c7a306f5a073fbb68e93a074ca2d1f054 (diff)
downloadnixpkgs-5d2dfa253eaf9092bfc10695e40b2c80371dd55c.tar
nixpkgs-5d2dfa253eaf9092bfc10695e40b2c80371dd55c.tar.gz
nixpkgs-5d2dfa253eaf9092bfc10695e40b2c80371dd55c.tar.bz2
nixpkgs-5d2dfa253eaf9092bfc10695e40b2c80371dd55c.tar.lz
nixpkgs-5d2dfa253eaf9092bfc10695e40b2c80371dd55c.tar.xz
nixpkgs-5d2dfa253eaf9092bfc10695e40b2c80371dd55c.tar.zst
nixpkgs-5d2dfa253eaf9092bfc10695e40b2c80371dd55c.zip
firejail: Fix resolve binary paths in user environment
Diffstat (limited to 'pkgs/os-specific/linux/firejail/default.nix')
-rw-r--r--pkgs/os-specific/linux/firejail/default.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix
index c3dc819b5bc..3caf41cfca5 100644
--- a/pkgs/os-specific/linux/firejail/default.nix
+++ b/pkgs/os-specific/linux/firejail/default.nix
@@ -37,9 +37,16 @@ stdenv.mkDerivation rec {
     # Adds the /nix directory when using an overlay.
     # Required to run any programs under this mode.
     ./mount-nix-dir-on-overlay.patch
+
     # By default fbuilder hardcodes the firejail binary to the install path.
     # On NixOS the firejail binary is a setuid wrapper available in $PATH.
     ./fbuilder-call-firejail-on-path.patch
+
+    # NixOS specific whitelist to resolve binary paths in user environment
+    # Fixes https://github.com/NixOS/nixpkgs/issues/170784
+    # Upstream fix https://github.com/netblue30/firejail/pull/5131
+    # Upstream hopefully fixed in later versions > 0.9.68
+   ./whitelist-nix-profile.patch
   ];
 
   prePatch = ''