movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 13:40:28 +03:00
Code Activity

dbus: remove unused daemon passhtru

Browse source
This commit is contained in:
Sandro Jäckel 2022-11-21 03:03:50 +01:00
parent 8b5dd47fe0
commit c7f5becba3
29 changed files with 32 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nixos/tests/virtualbox.nix
View file

@ -28,8 +28,8 @@ let
messagebus:x:1: messagebus:x:1:
EOF EOF
"${pkgs.dbus.daemon}/bin/dbus-daemon" --fork \ "${pkgs.dbus}/bin/dbus-daemon" --fork \
--config-file="${pkgs.dbus.daemon}/share/dbus-1/system.conf" --config-file="${pkgs.dbus}/share/dbus-1/system.conf"
${guestAdditions}/bin/VBoxService ${guestAdditions}/bin/VBoxService
${(attrs.vmScript or (const "")) pkgs} ${(attrs.vmScript or (const "")) pkgs}

4
pkgs/applications/audio/quodlibet/default.nix
View file

@ -119,7 +119,7 @@ python3.pkgs.buildPythonApplication rec {
LC_ALL = "en_US.UTF-8"; LC_ALL = "en_US.UTF-8";
checkInputs = [ checkInputs = [
dbus.daemon dbus
gdk-pixbuf gdk-pixbuf
glibcLocales glibcLocales
hicolor-icon-theme hicolor-icon-theme
@ -154,7 +154,7 @@ python3.pkgs.buildPythonApplication rec {
runHook preCheck runHook preCheck
xvfb-run -s '-screen 0 1920x1080x24' \ 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 pytest $pytestFlags
runHook postCheck runHook postCheck

2
pkgs/applications/editors/gnome-builder/default.nix
View file

@ -138,7 +138,7 @@ stdenv.mkDerivation rec {
checkPhase = '' checkPhase = ''
export NO_AT_BRIDGE=1 export NO_AT_BRIDGE=1
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ 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 meson test --print-errorlogs
''; '';

2
pkgs/applications/misc/girara/default.nix
View file

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
checkPhase = '' checkPhase = ''
export NO_AT_BRIDGE=1 export NO_AT_BRIDGE=1
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ 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 meson test --print-errorlogs
''; '';

2
pkgs/applications/networking/calls/default.nix
View file

@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
NO_AT_BRIDGE=1 \ NO_AT_BRIDGE=1 \
XDG_DATA_DIRS=${folks}/share/gsettings-schemas/${folks.name} \ XDG_DATA_DIRS=${folks}/share/gsettings-schemas/${folks.name} \
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ 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 meson test --print-errorlogs
runHook postCheck runHook postCheck
''; '';

4
pkgs/applications/networking/instant-messengers/gajim/default.nix
View file

@ -56,11 +56,11 @@ python3.pkgs.buildPythonApplication rec {
++ lib.optionals enableOmemoPluginDependencies [ python-axolotl qrcode ] ++ lib.optionals enableOmemoPluginDependencies [ python-axolotl qrcode ]
++ extraPythonPackages python3.pkgs; ++ extraPythonPackages python3.pkgs;
checkInputs = [ xvfb-run dbus.daemon ]; checkInputs = [ xvfb-run dbus ];
checkPhase = '' checkPhase = ''
xvfb-run dbus-run-session \ 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/gtk -v
${python3.interpreter} -m unittest discover -s test/no_gui -v ${python3.interpreter} -m unittest discover -s test/no_gui -v
''; '';

2
pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
View file

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config libxslt ]; nativeBuildInputs = [ pkg-config libxslt ];
buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls python2 ]; 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" ]; configureFlags = [ "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" ];

4
pkgs/applications/office/paperwork/paperwork-gtk.nix
View file

@ -83,7 +83,7 @@ python3Packages.buildPythonApplication rec {
done done
''; '';
checkInputs = [ dbus.daemon ]; checkInputs = [ dbus ];
nativeBuildInputs = [ nativeBuildInputs = [
wrapGAppsHook wrapGAppsHook
@ -114,7 +114,7 @@ python3Packages.buildPythonApplication rec {
# only need to run a virtual X server + dbus but also have a large enough # 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. # resolution, because the Cairo test tries to draw a 200x200 window.
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ 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 $out/bin/paperwork-gtk chkdeps
# content of make test, without the dep on make install # content of make test, without the dep on make install

2
pkgs/applications/science/electronics/kicad/base.nix
View file

@ -133,7 +133,7 @@ stdenv.mkDerivation rec {
libdatrie libdatrie
libxkbcommon libxkbcommon
libepoxy libepoxy
dbus.daemon dbus
at-spi2-core at-spi2-core
libXtst libXtst
]; ];

2
pkgs/applications/video/streamlink-twitch-gui/bin.nix
View file

@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
autoPatchelfHook autoPatchelfHook
cairo cairo
cups.lib cups.lib
dbus.daemon.lib dbus.lib
expat expat
gcc-unwrapped gcc-unwrapped
gdk-pixbuf gdk-pixbuf

2
pkgs/applications/window-managers/phosh/default.nix
View file

@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
runHook preCheck runHook preCheck
export NO_AT_BRIDGE=1 export NO_AT_BRIDGE=1
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ 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 meson test --print-errorlogs
runHook postCheck runHook postCheck
''; '';

2
pkgs/desktops/gnome/core/gnome-keyring/default.nix
View file

@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
checkPhase = '' checkPhase = ''
export HOME=$(mktemp -d) export HOME=$(mktemp -d)
dbus-run-session \ dbus-run-session \
--config-file=${dbus.daemon}/share/dbus-1/session.conf \ --config-file=${dbus}/share/dbus-1/session.conf \
make check make check
''; '';

2
pkgs/desktops/gnome/misc/geary/default.nix
View file

@ -129,7 +129,7 @@ stdenv.mkDerivation rec {
HOME=$TMPDIR \ 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} \ 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 \ 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 meson test -v --no-stdsplit
runHook postCheck runHook postCheck

2
pkgs/development/libraries/amtk/default.nix
View file

@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
checkPhase = '' checkPhase = ''
export NO_AT_BRIDGE=1 export NO_AT_BRIDGE=1
${xvfb-run}/bin/xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ ${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 meson test --print-errorlogs
''; '';

1
pkgs/development/libraries/dbus/default.nix
View file

@ -108,7 +108,6 @@ stdenv.mkDerivation rec {
passthru = { passthru = {
dbus-launch = "${dbus.lib}/bin/dbus-launch"; dbus-launch = "${dbus.lib}/bin/dbus-launch";
daemon = dbus.out;
}; };
meta = with lib; { meta = with lib; {

2
pkgs/development/libraries/glib/default.nix
View file

@ -226,7 +226,7 @@ stdenv.mkDerivation (finalAttrs: {
export XDG_RUNTIME_HOME="$TMP" export XDG_RUNTIME_HOME="$TMP"
export HOME="$TMP" export HOME="$TMP"
export XDG_DATA_DIRS="${desktop-file-utils}/share:${shared-mime-info}/share" 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" export PATH="$PATH:$(pwd)/gobject"
echo "PATH=$PATH" echo "PATH=$PATH"
''; '';

2
pkgs/development/libraries/gtksourceview/3.x.nix
View file

@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
NO_AT_BRIDGE=1 \ NO_AT_BRIDGE=1 \
XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \ XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ 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 make check
''; '';

2
pkgs/development/libraries/gtksourceview/4.x.nix
View file

@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \ XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ 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 meson test --no-rebuild --print-errorlogs
runHook postCheck runHook postCheck

2
pkgs/development/libraries/gtksourceview/5.x.nix
View file

@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \ XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ 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 meson test --no-rebuild --print-errorlogs
runHook postCheck runHook postCheck

2
pkgs/development/libraries/libdazzle/default.nix
View file

@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
checkPhase = '' checkPhase = ''
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ 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 meson test --print-errorlogs
''; '';

2
pkgs/development/libraries/libhandy/0.x.nix
View file

@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
NO_AT_BRIDGE=1 \ NO_AT_BRIDGE=1 \
XDG_DATA_DIRS="$XDG_DATA_DIRS:${hicolor-icon-theme}/share" \ XDG_DATA_DIRS="$XDG_DATA_DIRS:${hicolor-icon-theme}/share" \
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ 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 meson test --print-errorlogs
''; '';

2
pkgs/development/libraries/libsecret/default.nix
View file

@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
runHook preCheck runHook preCheck
dbus-run-session \ dbus-run-session \
--config-file=${dbus.daemon}/share/dbus-1/session.conf \ --config-file=${dbus}/share/dbus-1/session.conf \
meson test --print-errorlogs meson test --print-errorlogs
runHook postCheck runHook postCheck

2
pkgs/development/libraries/telepathy/qt/default.nix
View file

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config python ]; nativeBuildInputs = [ cmake pkg-config python ];
propagatedBuildInputs = [ qtbase telepathy-farstream telepathy-glib ]; propagatedBuildInputs = [ qtbase telepathy-farstream telepathy-glib ];
buildInputs = [ dbus-glib ]; buildInputs = [ dbus-glib ];
checkInputs = [ dbus.daemon dbus-python ]; checkInputs = [ dbus dbus-python ];
# No point in building tests if they are not run # No point in building tests if they are not run
# On 0.9.7, they do not even build with QT4 # On 0.9.7, they do not even build with QT4

2
pkgs/development/libraries/tracker/default.nix
View file

@ -117,7 +117,7 @@ stdenv.mkDerivation rec {
runHook preCheck runHook preCheck
dbus-run-session \ dbus-run-session \
--config-file=${dbus.daemon}/share/dbus-1/session.conf \ --config-file=${dbus}/share/dbus-1/session.conf \
meson test \ meson test \
--timeout-multiplier 2 \ --timeout-multiplier 2 \
--print-errorlogs --print-errorlogs

2
pkgs/development/python-modules/dbus-next/default.nix
View file

@ -29,7 +29,7 @@ buildPythonPackage rec {
# test_tcp_connection_with_forwarding fails due to dbus # test_tcp_connection_with_forwarding fails due to dbus
# creating unix socket anyway on v1.14.4 # creating unix socket anyway on v1.14.4
checkPhase = '' 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 \ ${python.interpreter} -m pytest -sv --cov=dbus_next \
-k "not test_peer_interface and not test_tcp_connection_with_forwarding" -k "not test_peer_interface and not test_tcp_connection_with_forwarding"
''; '';

2
pkgs/development/python-modules/dogtail/default.nix
View file

@ -45,7 +45,7 @@ buildPythonPackage {
# export NO_AT_BRIDGE=1 # export NO_AT_BRIDGE=1
gsettings set org.gnome.desktop.interface toolkit-accessibility true gsettings set org.gnome.desktop.interface toolkit-accessibility true
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ 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 ${python.interpreter} nix_run_setup test
runHook postCheck runHook postCheck
''; '';

2
pkgs/development/python-modules/notify-py/default.nix
View file

@ -61,7 +61,7 @@ buildPythonPackage rec {
PATH="$TMP/bin:$PATH" pytest PATH="$TMP/bin:$PATH" pytest
'' else if stdenv.isLinux then '' '' else if stdenv.isLinux then ''
dbus-run-session \ dbus-run-session \
--config-file=${dbus.daemon}/share/dbus-1/session.conf \ --config-file=${dbus}/share/dbus-1/session.conf \
pytest pytest
'' else '' '' else ''
pytest pytest

2
pkgs/tools/inputmethods/ibus/default.nix
View file

@ -52,7 +52,7 @@ let
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
} '' } ''
makeWrapper ${dbus}/bin/dbus-launch $out/bin/dbus-launch \ 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 in

2
pkgs/tools/networking/modemmanager/default.nix
View file

@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
# install check instead, when those paths will have been created. # install check instead, when those paths will have been created.
doInstallCheck = true; doInstallCheck = true;
preInstallCheck = '' 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 patchShebangs tools/tests/test-wrapper.sh
''; '';
installCheckTarget = "check"; installCheckTarget = "check";