diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-11-28 01:35:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-28 01:35:34 +0100 |
| commit | 853077236a65ff48e9012c9ac80c25f6fdbfa8bd (patch) | |
| tree | afba66134493958039ca272e89f9734c89795924 /pkgs/applications/networking | |
| parent | b7b60a35cf900dd320503006f30a4b3bf10ca4c1 (diff) | |
| parent | c7f5becba357f9dd8480ab635a07d106024dc6a6 (diff) | |
Merge pull request #202124 from SuperSandro2000/dbus-passthru-daemon
Diffstat (limited to 'pkgs/applications/networking')
3 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix index a0a9b10f068a0..ab81254c710fe 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 b23b647907108..648569a9c0302 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 b3fe15fcaac6e..343e9069bcaf0 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config libxslt python3 ]; buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls ]; - checkInputs = [ dbus.daemon ]; + checkInputs = [ dbus ]; configureFlags = [ "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" ]; |