diff options
| author | Andrew Marshall <andrew@johnandrewmarshall.com> | 2023-02-23 23:13:46 -0500 |
|---|---|---|
| committer | Andrew Marshall <andrew@johnandrewmarshall.com> | 2023-02-23 23:30:14 -0500 |
| commit | c84e76ec70adbd4cd0a52dac06d81602afe966cf (patch) | |
| tree | 8d6f9d9eec001782b011ad723589031bae84a7a5 | |
| parent | c992e25a7d5d59675584a197af5a38e582a70b4b (diff) | |
| download | nixpkgs-c84e76ec70adbd4cd0a52dac06d81602afe966cf.tar nixpkgs-c84e76ec70adbd4cd0a52dac06d81602afe966cf.tar.gz nixpkgs-c84e76ec70adbd4cd0a52dac06d81602afe966cf.tar.bz2 nixpkgs-c84e76ec70adbd4cd0a52dac06d81602afe966cf.tar.lz nixpkgs-c84e76ec70adbd4cd0a52dac06d81602afe966cf.tar.xz nixpkgs-c84e76ec70adbd4cd0a52dac06d81602afe966cf.tar.zst nixpkgs-c84e76ec70adbd4cd0a52dac06d81602afe966cf.zip | |
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.
| -rw-r--r-- | pkgs/desktops/gnome/core/gnome-keyring/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/desktops/gnome/core/gnome-keyring/default.nix b/pkgs/desktops/gnome/core/gnome-keyring/default.nix index 877b99748ec..6a160f6cf77 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 |