From d9ce15a363306688d7d088bde06a45bb9d706d18 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Tue, 15 Oct 2024 15:11:41 -0400 Subject: [PATCH] bitwarden-desktop: remove unneeded dbus-run-session for tests This appears to no longer be needed. Still run in a subshell to avoid polluting `HOME` to the rest of the build. --- pkgs/by-name/bi/bitwarden-desktop/package.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index c57f7d47d56e..6531632cc1bd 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -2,7 +2,6 @@ , buildNpmPackage , cargo , copyDesktopItems -, dbus , electron_32 , fetchFromGitHub , glib @@ -135,7 +134,6 @@ in buildNpmPackage rec { doCheck = true; nativeCheckInputs = [ - dbus (gnome-keyring.override { useWrappedDaemon = false; }) ]; @@ -148,14 +146,9 @@ in buildNpmPackage rec { ( cd ${cargoRoot} - export HOME=$(mktemp -d) - export cargoCheckType=release - for function in $(declare -F | awk '{print $3}'); do - export -f "$function" - done - dbus-run-session \ - --config-file=${dbus}/share/dbus-1/session.conf \ - -- bash -e -c cargoCheckHook + HOME=$(mktemp -d) + cargoCheckType=release + cargoCheckHook ) runHook postCheck