diff options
| author | 0x4A6F <0x4A6F@users.noreply.github.com> | 2022-05-09 22:13:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-09 22:13:11 +0200 |
| commit | b2c14fec914854e44d47edcf7122ffbb9edb2add (patch) | |
| tree | 32ec6578a9919aec917184ed1fe70cd290af191b /pkgs/os-specific | |
| parent | 775806ed3a12baeea1eafd60aa52afd832ac74bd (diff) | |
| parent | e87b171be6ed6a5e7d9bb31137993e48a0c6a8f7 (diff) | |
Merge pull request #171933 from onny/firejail-opengl
firejail: Fix opengl support for various apps
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/firejail/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/firejail/fix-opengl-support.patch | 7 |
2 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index 3caf41cfca562..bbb3a1daab698 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -47,6 +47,12 @@ stdenv.mkDerivation rec { # Upstream fix https://github.com/netblue30/firejail/pull/5131 # Upstream hopefully fixed in later versions > 0.9.68 ./whitelist-nix-profile.patch + + # Fix OpenGL support for various applications including Firefox + # Issue: https://github.com/NixOS/nixpkgs/issues/55191 + # Upstream fix: https://github.com/netblue30/firejail/pull/5132 + # Hopefully fixed upstream in version > 0.9.68 + ./fix-opengl-support.patch ]; prePatch = '' diff --git a/pkgs/os-specific/linux/firejail/fix-opengl-support.patch b/pkgs/os-specific/linux/firejail/fix-opengl-support.patch new file mode 100644 index 0000000000000..9fd18aad3fd9c --- /dev/null +++ b/pkgs/os-specific/linux/firejail/fix-opengl-support.patch @@ -0,0 +1,7 @@ +--- a/etc/inc/whitelist-run-common.inc.org 2022-05-07 11:27:32.264849186 +0200 ++++ b/etc/inc/whitelist-run-common.inc 2022-05-07 11:27:55.577778211 +0200 +@@ -13,3 +13,4 @@ + whitelist /run/systemd/resolve/resolv.conf + whitelist /run/systemd/resolve/stub-resolv.conf + whitelist /run/udev/data ++whitelist /run/opengl-driver # NixOS |