Merge pull request #104487 from snicket2100/firejail-xdg-dbus-proxy

firejail: fixing the 'xdg-dbus-proxy' dependency
This commit is contained in:
Michael Raskin
2020-11-22 16:32:19 +00:00
committed by GitHub

View File

@@ -1,4 +1,4 @@
{stdenv, fetchurl, fetchpatch, which, nixosTests}:
{stdenv, fetchurl, fetchpatch, which, xdg-dbus-proxy, nixosTests}:
let
s = # Generated upstream information
rec {
@@ -25,6 +25,10 @@ stdenv.mkDerivation {
substituteInPlace etc/firejail.config --replace \
'# follow-symlink-as-user yes' \
'follow-symlink-as-user no'
# 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'
'';
preConfigure = ''