Unverified Commit 85307723 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

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

parents b7b60a35 c7f5becb

nixos/tests/virtualbox.nix

+2 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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

  '';