diff options
author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2022-11-21 03:03:50 +0100 |
---|---|---|
committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2022-11-21 20:23:00 +0100 |
commit | c7f5becba357f9dd8480ab635a07d106024dc6a6 (patch) | |
tree | b3b7b8c5c3bccdf0c744003bd9d3359200664311 /pkgs/development/libraries | |
parent | 8b5dd47fe0db0834cebda33ad4b2d8f5ba4e9aa5 (diff) | |
download | nixpkgs-c7f5becba357f9dd8480ab635a07d106024dc6a6.tar nixpkgs-c7f5becba357f9dd8480ab635a07d106024dc6a6.tar.gz nixpkgs-c7f5becba357f9dd8480ab635a07d106024dc6a6.tar.bz2 nixpkgs-c7f5becba357f9dd8480ab635a07d106024dc6a6.tar.lz nixpkgs-c7f5becba357f9dd8480ab635a07d106024dc6a6.tar.xz nixpkgs-c7f5becba357f9dd8480ab635a07d106024dc6a6.tar.zst nixpkgs-c7f5becba357f9dd8480ab635a07d106024dc6a6.zip |
dbus: remove unused daemon passhtru
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/amtk/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/dbus/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/libraries/glib/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/gtksourceview/3.x.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/gtksourceview/4.x.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/gtksourceview/5.x.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/libdazzle/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/libhandy/0.x.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/libsecret/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/telepathy/qt/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/tracker/default.nix | 2 |
11 files changed, 10 insertions, 11 deletions
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 |