3
0
Fork 0
forked from mirrors/nixpkgs

firejail: Fix resolve binary paths in user environment

This commit is contained in:
Jonas Heinrich 2022-05-06 14:05:35 +02:00
parent f678ad7c7a
commit 5d2dfa253e
2 changed files with 16 additions and 0 deletions

View file

@ -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 = ''

View file

@ -0,0 +1,9 @@
--- a/etc/inc/whitelist-common.inc.org 2022-05-06 13:57:17.294206339 +0200
+++ b/etc/inc/whitelist-common.inc 2022-05-06 13:58:00.108655548 +0200
@@ -83,3 +83,6 @@
whitelist ${HOME}/.kde4/share/config/oxygenrc
whitelist ${HOME}/.kde4/share/icons
whitelist ${HOME}/.local/share/qt5ct
+
+# NixOS specific to resolve binary paths
+whitelist ${HOME}/.nix-profile