gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #202124 from SuperSandro2000/dbus-passthru-daemon

Browse Source
This commit is contained in:
Sandro
2022-11-28 01:35:34 +01:00
committed by GitHub
parent b7b60a35cf c7f5becba3
commit 853077236a
29 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/tests/virtualbox.nix
+2 -2
View File
@@ -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}
pkgs/applications/audio/quodlibet/default.nix
+2 -2
View File
@@ -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
pkgs/applications/editors/gnome-builder/default.nix
+1 -1
View File
@@ -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
'';
pkgs/applications/misc/girara/default.nix
+1 -1
View File
@@ -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
'';
pkgs/applications/networking/calls/default.nix
+1 -1
View File
@@ -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
'';
pkgs/applications/networking/instant-messengers/gajim/default.nix
+2 -2
View File
@@ -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
'';
pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
+1 -1
View File
@@ -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" ];
pkgs/applications/office/paperwork/paperwork-gtk.nix
+2 -2
View File
@@ -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
pkgs/applications/science/electronics/kicad/base.nix
+1 -1
View File
@@ -133,7 +133,7 @@ stdenv.mkDerivation rec {
libdatrie
libxkbcommon
libepoxy
dbus.daemon
dbus
at-spi2-core
libXtst
];
pkgs/applications/video/streamlink-twitch-gui/bin.nix
+1 -1
View File
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
autoPatchelfHook
cairo
cups.lib
dbus.daemon.lib
dbus.lib
expat
gcc-unwrapped
gdk-pixbuf
pkgs/applications/window-managers/phosh/default.nix
+1 -1
View File
@@ -103,7 +103,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
'';
pkgs/desktops/gnome/core/gnome-keyring/default.nix
+1 -1
View File
@@ -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
'';
pkgs/desktops/gnome/misc/geary/default.nix
+1 -1
View File
@@ -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
pkgs/development/libraries/amtk/default.nix
+1 -1
View File
@@ -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
'';
pkgs/development/libraries/dbus/default.nix
-1
View File
@@ -108,7 +108,6 @@ stdenv.mkDerivation rec {
passthru = {
dbus-launch = "${dbus.lib}/bin/dbus-launch";
daemon = dbus.out;
};
meta = with lib; {
pkgs/development/libraries/glib/default.nix
+1 -1
View File
@@ -257,7 +257,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"
'';
pkgs/development/libraries/gtksourceview/3.x.nix
+1 -1
View File
@@ -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
'';
pkgs/development/libraries/gtksourceview/4.x.nix
+1 -1
View File
@@ -86,7 +86,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
pkgs/development/libraries/gtksourceview/5.x.nix
+1 -1
View File
@@ -88,7 +88,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
pkgs/development/libraries/libdazzle/default.nix
+1 -1
View File
@@ -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
'';
pkgs/development/libraries/libhandy/0.x.nix
+1 -1
View File
@@ -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
'';
pkgs/development/libraries/libsecret/default.nix
+1 -1
View File
@@ -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
pkgs/development/libraries/telepathy/qt/default.nix
+1 -1
View File
@@ -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
pkgs/development/libraries/tracker/default.nix
+1 -1
View File
@@ -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
pkgs/development/python-modules/dbus-next/default.nix
+1 -1
View File
@@ -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"
'';
pkgs/development/python-modules/dogtail/default.nix
+1 -1
View File
@@ -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
'';
pkgs/development/python-modules/notify-py/default.nix
+1 -1
View File
@@ -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
pkgs/tools/inputmethods/ibus/default.nix
+1 -1
View File
@@ -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
pkgs/tools/networking/modemmanager/default.nix
+1 -1
View File
@@ -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";