public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
commit d006ea0663
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/firejail/default.nix
View File

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