From 03ee925c058b7c0ad3786897883acae8adfd862a Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 17 Feb 2023 12:09:11 +0100 Subject: firejail: Fix double-dash usage on non-POSIX shells --- pkgs/os-specific/linux/firejail/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index 9ab8eac772c..64607c5653e 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -47,6 +47,12 @@ stdenv.mkDerivation rec { # Fix the path to 'xdg-dbus-proxy' hardcoded in the 'common.h' file substituteInPlace src/include/common.h \ --replace '/usr/bin/xdg-dbus-proxy' '${xdg-dbus-proxy}/bin/xdg-dbus-proxy' + + # Workaround for regression introduced in 0.9.72 preventing usage of + # end-of-options indicator "--" + # See https://github.com/netblue30/firejail/issues/5659 + substituteInPlace src/firejail/sandbox.c \ + --replace " && !arg_doubledash" "" ''; preConfigure = '' -- cgit 1.4.1