From c84e76ec70adbd4cd0a52dac06d81602afe966cf Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Thu, 23 Feb 2023 23:13:46 -0500 Subject: [PATCH] gnome-keyring: Add arg to build without wrapper Some derivations may want to use gnome-keyring during their build, e.g. for tests, but the wrapper for gnome-keyring-daemon not does not inside the sandbox, so add an option to build without it. This will, at least, be used in the upcoming bitwarden source-based build. --- pkgs/desktops/gnome/core/gnome-keyring/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/core/gnome-keyring/default.nix b/pkgs/desktops/gnome/core/gnome-keyring/default.nix index 877b99748ec5..6a160f6cf77d 100644 --- a/pkgs/desktops/gnome/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome/core/gnome-keyring/default.nix @@ -19,6 +19,7 @@ , docbook-xsl-nons , docbook_xml_dtd_43 , gnome +, useWrappedDaemon ? true }: stdenv.mkDerivation rec { @@ -78,7 +79,7 @@ stdenv.mkDerivation rec { ''; # Use wrapped gnome-keyring-daemon with cap_ipc_lock=ep - postFixup = '' + postFixup = lib.optionalString useWrappedDaemon '' files=($out/etc/xdg/autostart/* $out/share/dbus-1/services/*) for file in ''${files[*]}; do