From c7f5becba357f9dd8480ab635a07d106024dc6a6 Mon Sep 17 00:00:00 2001 From: Sandro Jäckel Date: Mon, 21 Nov 2022 03:03:50 +0100 Subject: dbus: remove unused daemon passhtru --- nixos/tests/virtualbox.nix | 4 ++-- pkgs/applications/audio/quodlibet/default.nix | 4 ++-- pkgs/applications/editors/gnome-builder/default.nix | 2 +- pkgs/applications/misc/girara/default.nix | 2 +- pkgs/applications/networking/calls/default.nix | 2 +- pkgs/applications/networking/instant-messengers/gajim/default.nix | 4 ++-- .../networking/instant-messengers/telepathy/gabble/default.nix | 2 +- pkgs/applications/office/paperwork/paperwork-gtk.nix | 4 ++-- pkgs/applications/science/electronics/kicad/base.nix | 2 +- pkgs/applications/video/streamlink-twitch-gui/bin.nix | 2 +- pkgs/applications/window-managers/phosh/default.nix | 2 +- pkgs/desktops/gnome/core/gnome-keyring/default.nix | 2 +- pkgs/desktops/gnome/misc/geary/default.nix | 2 +- pkgs/development/libraries/amtk/default.nix | 2 +- pkgs/development/libraries/dbus/default.nix | 1 - pkgs/development/libraries/glib/default.nix | 2 +- pkgs/development/libraries/gtksourceview/3.x.nix | 2 +- pkgs/development/libraries/gtksourceview/4.x.nix | 2 +- pkgs/development/libraries/gtksourceview/5.x.nix | 2 +- pkgs/development/libraries/libdazzle/default.nix | 2 +- pkgs/development/libraries/libhandy/0.x.nix | 2 +- pkgs/development/libraries/libsecret/default.nix | 2 +- pkgs/development/libraries/telepathy/qt/default.nix | 2 +- pkgs/development/libraries/tracker/default.nix | 2 +- pkgs/development/python-modules/dbus-next/default.nix | 2 +- pkgs/development/python-modules/dogtail/default.nix | 2 +- pkgs/development/python-modules/notify-py/default.nix | 2 +- pkgs/tools/inputmethods/ibus/default.nix | 2 +- pkgs/tools/networking/modemmanager/default.nix | 2 +- 29 files changed, 32 insertions(+), 33 deletions(-) diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index 1c1b0dac7f3..0be22bdcaea 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -28,8 +28,8 @@ let messagebus:x:1: EOF - "${pkgs.dbus.daemon}/bin/dbus-daemon" --fork \ - --config-file="${pkgs.dbus.daemon}/share/dbus-1/system.conf" + "${pkgs.dbus}/bin/dbus-daemon" --fork \ + --config-file="${pkgs.dbus}/share/dbus-1/system.conf" ${guestAdditions}/bin/VBoxService ${(attrs.vmScript or (const "")) pkgs} diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index c5f02d7085d..aacc584c5b8 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -119,7 +119,7 @@ python3.pkgs.buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; checkInputs = [ - dbus.daemon + dbus gdk-pixbuf glibcLocales hicolor-icon-theme @@ -154,7 +154,7 @@ python3.pkgs.buildPythonApplication rec { runHook preCheck xvfb-run -s '-screen 0 1920x1080x24' \ - dbus-run-session --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf \ pytest $pytestFlags runHook postCheck diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 54625d75e5c..5b6f5d00982 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -138,7 +138,7 @@ stdenv.mkDerivation rec { checkPhase = '' export NO_AT_BRIDGE=1 xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ meson test --print-errorlogs ''; diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 02f0a09e0df..591f26abbc7 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { checkPhase = '' export NO_AT_BRIDGE=1 xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ meson test --print-errorlogs ''; diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix index a0a9b10f068..ab81254c710 100644 --- a/pkgs/applications/networking/calls/default.nix +++ b/pkgs/applications/networking/calls/default.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { NO_AT_BRIDGE=1 \ XDG_DATA_DIRS=${folks}/share/gsettings-schemas/${folks.name} \ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ meson test --print-errorlogs runHook postCheck ''; diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index b23b6479071..648569a9c03 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -56,11 +56,11 @@ python3.pkgs.buildPythonApplication rec { ++ lib.optionals enableOmemoPluginDependencies [ python-axolotl qrcode ] ++ extraPythonPackages python3.pkgs; - checkInputs = [ xvfb-run dbus.daemon ]; + checkInputs = [ xvfb-run dbus ]; checkPhase = '' xvfb-run dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ ${python3.interpreter} -m unittest discover -s test/gtk -v ${python3.interpreter} -m unittest discover -s test/no_gui -v ''; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index 3b1775a7ba8..f680c3dbca4 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config libxslt ]; buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls python2 ]; - checkInputs = [ dbus.daemon ]; + checkInputs = [ dbus ]; configureFlags = [ "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" ]; diff --git a/pkgs/applications/office/paperwork/paperwork-gtk.nix b/pkgs/applications/office/paperwork/paperwork-gtk.nix index 81fc8c075f1..387e6c2d765 100644 --- a/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -83,7 +83,7 @@ python3Packages.buildPythonApplication rec { done ''; - checkInputs = [ dbus.daemon ]; + checkInputs = [ dbus ]; nativeBuildInputs = [ wrapGAppsHook @@ -114,7 +114,7 @@ python3Packages.buildPythonApplication rec { # only need to run a virtual X server + dbus but also have a large enough # resolution, because the Cairo test tries to draw a 200x200 window. xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ $out/bin/paperwork-gtk chkdeps # content of make test, without the dep on make install diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index f81710cfb91..91834642681 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -133,7 +133,7 @@ stdenv.mkDerivation rec { libdatrie libxkbcommon libepoxy - dbus.daemon + dbus at-spi2-core libXtst ]; diff --git a/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/pkgs/applications/video/streamlink-twitch-gui/bin.nix index 38b0301bbc9..706a41e0a50 100644 --- a/pkgs/applications/video/streamlink-twitch-gui/bin.nix +++ b/pkgs/applications/video/streamlink-twitch-gui/bin.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { autoPatchelfHook cairo cups.lib - dbus.daemon.lib + dbus.lib expat gcc-unwrapped gdk-pixbuf diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index d71ff01362d..0aa63eb52fb 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { runHook preCheck export NO_AT_BRIDGE=1 xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ meson test --print-errorlogs runHook postCheck ''; diff --git a/pkgs/desktops/gnome/core/gnome-keyring/default.nix b/pkgs/desktops/gnome/core/gnome-keyring/default.nix index 22a94de5e84..0ef440a78f1 100644 --- a/pkgs/desktops/gnome/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome/core/gnome-keyring/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { checkPhase = '' export HOME=$(mktemp -d) dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ make check ''; diff --git a/pkgs/desktops/gnome/misc/geary/default.nix b/pkgs/desktops/gnome/misc/geary/default.nix index cb7726d5906..d1ba5d8082c 100644 --- a/pkgs/desktops/gnome/misc/geary/default.nix +++ b/pkgs/desktops/gnome/misc/geary/default.nix @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { HOME=$TMPDIR \ XDG_DATA_DIRS=$XDG_DATA_DIRS:${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${shared-mime-info}/share:${folks}/share/gsettings-schemas/${folks.name} \ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ meson test -v --no-stdsplit runHook postCheck diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix index 4a47ec61645..0dff9031353 100644 --- a/pkgs/development/libraries/amtk/default.nix +++ b/pkgs/development/libraries/amtk/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { checkPhase = '' export NO_AT_BRIDGE=1 ${xvfb-run}/bin/xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ meson test --print-errorlogs ''; diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 2cd6463d5c2..795c2c51ddf 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -108,7 +108,6 @@ stdenv.mkDerivation rec { passthru = { dbus-launch = "${dbus.lib}/bin/dbus-launch"; - daemon = dbus.out; }; meta = with lib; { diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index b38ba682a76..3ac3a1acf02 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -226,7 +226,7 @@ stdenv.mkDerivation (finalAttrs: { export XDG_RUNTIME_HOME="$TMP" export HOME="$TMP" export XDG_DATA_DIRS="${desktop-file-utils}/share:${shared-mime-info}/share" - export G_TEST_DBUS_DAEMON="${dbus.daemon}/bin/dbus-daemon" + export G_TEST_DBUS_DAEMON="${dbus}/bin/dbus-daemon" export PATH="$PATH:$(pwd)/gobject" echo "PATH=$PATH" ''; diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix index dce589dd647..c7c04f5e816 100644 --- a/pkgs/development/libraries/gtksourceview/3.x.nix +++ b/pkgs/development/libraries/gtksourceview/3.x.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { NO_AT_BRIDGE=1 \ XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ make check ''; diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index 315547ad386..7eaa5c18050 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ meson test --no-rebuild --print-errorlogs runHook postCheck diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix index 25bd8127a54..64c98712fd3 100644 --- a/pkgs/development/libraries/gtksourceview/5.x.nix +++ b/pkgs/development/libraries/gtksourceview/5.x.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ meson test --no-rebuild --print-errorlogs runHook postCheck diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix index aa808d5b4aa..ec616b4a5fa 100644 --- a/pkgs/development/libraries/libdazzle/default.nix +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { checkPhase = '' xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ meson test --print-errorlogs ''; diff --git a/pkgs/development/libraries/libhandy/0.x.nix b/pkgs/development/libraries/libhandy/0.x.nix index 2c2b09b4492..0109b4335e4 100644 --- a/pkgs/development/libraries/libhandy/0.x.nix +++ b/pkgs/development/libraries/libhandy/0.x.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { NO_AT_BRIDGE=1 \ XDG_DATA_DIRS="$XDG_DATA_DIRS:${hicolor-icon-theme}/share" \ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ meson test --print-errorlogs ''; diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index 24a34a92f3c..7de9fecd7da 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { runHook preCheck dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ meson test --print-errorlogs runHook postCheck diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index accc02499d4..667d6dce74f 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config python ]; propagatedBuildInputs = [ qtbase telepathy-farstream telepathy-glib ]; buildInputs = [ dbus-glib ]; - checkInputs = [ dbus.daemon dbus-python ]; + checkInputs = [ dbus dbus-python ]; # No point in building tests if they are not run # On 0.9.7, they do not even build with QT4 diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index 40744f987c8..36430666762 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -117,7 +117,7 @@ stdenv.mkDerivation rec { runHook preCheck dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ meson test \ --timeout-multiplier 2 \ --print-errorlogs diff --git a/pkgs/development/python-modules/dbus-next/default.nix b/pkgs/development/python-modules/dbus-next/default.nix index ebca00fe3be..37a57f296ba 100644 --- a/pkgs/development/python-modules/dbus-next/default.nix +++ b/pkgs/development/python-modules/dbus-next/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { # test_tcp_connection_with_forwarding fails due to dbus # creating unix socket anyway on v1.14.4 checkPhase = '' - dbus-run-session --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf \ ${python.interpreter} -m pytest -sv --cov=dbus_next \ -k "not test_peer_interface and not test_tcp_connection_with_forwarding" ''; diff --git a/pkgs/development/python-modules/dogtail/default.nix b/pkgs/development/python-modules/dogtail/default.nix index fb513a20c65..cc4430ddb39 100644 --- a/pkgs/development/python-modules/dogtail/default.nix +++ b/pkgs/development/python-modules/dogtail/default.nix @@ -45,7 +45,7 @@ buildPythonPackage { # export NO_AT_BRIDGE=1 gsettings set org.gnome.desktop.interface toolkit-accessibility true xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ ${python.interpreter} nix_run_setup test runHook postCheck ''; diff --git a/pkgs/development/python-modules/notify-py/default.nix b/pkgs/development/python-modules/notify-py/default.nix index 6d255424812..6ff41eeb36a 100644 --- a/pkgs/development/python-modules/notify-py/default.nix +++ b/pkgs/development/python-modules/notify-py/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { PATH="$TMP/bin:$PATH" pytest '' else if stdenv.isLinux then '' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + --config-file=${dbus}/share/dbus-1/session.conf \ pytest '' else '' pytest diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index c73598fd6ca..4037868518f 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -52,7 +52,7 @@ let nativeBuildInputs = [ makeWrapper ]; } '' makeWrapper ${dbus}/bin/dbus-launch $out/bin/dbus-launch \ - --add-flags --config-file=${dbus.daemon}/share/dbus-1/session.conf + --add-flags --config-file=${dbus}/share/dbus-1/session.conf ''; in diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix index 89ec8508bbf..cb768b8e95c 100644 --- a/pkgs/tools/networking/modemmanager/default.nix +++ b/pkgs/tools/networking/modemmanager/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { # install check instead, when those paths will have been created. doInstallCheck = true; preInstallCheck = '' - export G_TEST_DBUS_DAEMON="${dbus.daemon}/bin/dbus-daemon" + export G_TEST_DBUS_DAEMON="${dbus}/bin/dbus-daemon" patchShebangs tools/tests/test-wrapper.sh ''; installCheckTarget = "check"; -- cgit 1.4.1