commit c7f5becba357f9dd8480ab635a07d106024dc6a6 · pyrox.dev/nixpkgs

+2 -2

nixos/tests/virtualbox.nix

···

       28
       28
        
             messagebus:x:1:

     

       29
       29
        
             EOF

     

       30
       30
        
       

     

       31
       31
       -
             "${pkgs.dbus.daemon}/bin/dbus-daemon" --fork \

     

       32
       32
       -
               --config-file="${pkgs.dbus.daemon}/share/dbus-1/system.conf"

     

       31
       31
       +
             "${pkgs.dbus}/bin/dbus-daemon" --fork \

     

       32
       32
       +
               --config-file="${pkgs.dbus}/share/dbus-1/system.conf"

     

       33
       33
        
       

     

       34
       34
        
             ${guestAdditions}/bin/VBoxService

     

       35
       35
        
             ${(attrs.vmScript or (const "")) pkgs}

+2 -2

pkgs/applications/audio/quodlibet/default.nix

···

       119
       119
        
         LC_ALL = "en_US.UTF-8";

     

       120
       120
        
       

     

       121
       121
        
         checkInputs = [

     

       122
       122
       -
           dbus.daemon

     

       122
       122
       +
           dbus

     

       123
       123
        
           gdk-pixbuf

     

       124
       124
        
           glibcLocales

     

       125
       125
        
           hicolor-icon-theme

     
···

       154
       154
        
           runHook preCheck

     

       155
       155
        
       

     

       156
       156
        
           xvfb-run -s '-screen 0 1920x1080x24' \

     

       157
       157
       -
             dbus-run-session --config-file=${dbus.daemon}/share/dbus-1/session.conf \

     

       157
       157
       +
             dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf \

     

       158
       158
        
             pytest $pytestFlags

     

       159
       159
        
       

     

       160
       160
        
           runHook postCheck

+1 -1

pkgs/applications/editors/gnome-builder/default.nix

···

       138
       138
        
         checkPhase = ''

     

       139
       139
        
           export NO_AT_BRIDGE=1

     

       140
       140
        
           xvfb-run -s '-screen 0 800x600x24' dbus-run-session \

     

       141
       141
       -
             --config-file=${dbus.daemon}/share/dbus-1/session.conf \

     

       141
       141
       +
             --config-file=${dbus}/share/dbus-1/session.conf \

     

       142
       142
        
             meson test --print-errorlogs

     

       143
       143
        
         '';

     

       144
       144

+1 -1

pkgs/applications/misc/girara/default.nix

···

       26
       26
        
         checkPhase = ''

     

       27
       27
        
           export NO_AT_BRIDGE=1

     

       28
       28
        
           xvfb-run -s '-screen 0 800x600x24' dbus-run-session \

     

       29
       29
       -
             --config-file=${dbus.daemon}/share/dbus-1/session.conf \

     

       29
       29
       +
             --config-file=${dbus}/share/dbus-1/session.conf \

     

       30
       30
        
             meson test --print-errorlogs

     

       31
       31
        
         '';

     

       32
       32

+1 -1

pkgs/applications/networking/calls/default.nix

···

       98
       98
        
           NO_AT_BRIDGE=1 \

     

       99
       99
        
           XDG_DATA_DIRS=${folks}/share/gsettings-schemas/${folks.name} \

     

       100
       100
        
           xvfb-run -s '-screen 0 800x600x24' dbus-run-session \

     

       101
       101
       -
             --config-file=${dbus.daemon}/share/dbus-1/session.conf \

     

       101
       101
       +
             --config-file=${dbus}/share/dbus-1/session.conf \

     

       102
       102
        
             meson test --print-errorlogs

     

       103
       103
        
           runHook postCheck

     

       104
       104
        
         '';

+2 -2

pkgs/applications/networking/instant-messengers/gajim/default.nix

···

       56
       56
        
           ++ lib.optionals enableOmemoPluginDependencies [ python-axolotl qrcode ]

     

       57
       57
        
           ++ extraPythonPackages python3.pkgs;

     

       58
       58
        
       

     

       59
       59
       -
         checkInputs = [ xvfb-run dbus.daemon ];

     

       59
       59
       +
         checkInputs = [ xvfb-run dbus ];

     

       60
       60
        
       

     

       61
       61
        
         checkPhase = ''

     

       62
       62
        
           xvfb-run dbus-run-session \

     

       63
       63
       -
             --config-file=${dbus.daemon}/share/dbus-1/session.conf \

     

       63
       63
       +
             --config-file=${dbus}/share/dbus-1/session.conf \

     

       64
       64
        
             ${python3.interpreter} -m unittest discover -s test/gtk -v

     

       65
       65
        
           ${python3.interpreter} -m unittest discover -s test/no_gui -v

     

       66
       66
        
         '';

+1 -1

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

···

       13
       13
        
         nativeBuildInputs = [ pkg-config libxslt ];

     

       14
       14
        
         buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls python2 ];

     

       15
       15
        
       

     

       16
       16
       -
         checkInputs = [ dbus.daemon ];

     

       16
       16
       +
         checkInputs = [ dbus ];

     

       17
       17
        
       

     

       18
       18
        
         configureFlags = [ "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" ];

     

       19
       19

+2 -2

pkgs/applications/office/paperwork/paperwork-gtk.nix

···

       83
       83
        
           done

     

       84
       84
        
         '';

     

       85
       85
        
       

     

       86
       86
       -
         checkInputs = [ dbus.daemon ];

     

       86
       86
       +
         checkInputs = [ dbus ];

     

       87
       87
        
       

     

       88
       88
        
         nativeBuildInputs = [

     

       89
       89
        
           wrapGAppsHook

     
···

       114
       114
        
           # only need to run a virtual X server + dbus but also have a large enough

     

       115
       115
        
           # resolution, because the Cairo test tries to draw a 200x200 window.

     

       116
       116
        
           xvfb-run -s '-screen 0 800x600x24' dbus-run-session \

     

       117
       117
       -
             --config-file=${dbus.daemon}/share/dbus-1/session.conf \

     

       117
       117
       +
             --config-file=${dbus}/share/dbus-1/session.conf \

     

       118
       118
        
             $out/bin/paperwork-gtk chkdeps

     

       119
       119
        
       

     

       120
       120
        
           # content of make test, without the dep on make install

+1 -1

pkgs/applications/science/electronics/kicad/base.nix

···

       133
       133
        
           libdatrie

     

       134
       134
        
           libxkbcommon

     

       135
       135
        
           libepoxy

     

       136
       136
       -
           dbus.daemon

     

       136
       136
       +
           dbus

     

       137
       137
        
           at-spi2-core

     

       138
       138
        
           libXtst

     

       139
       139
        
         ];

+1 -1

pkgs/applications/video/streamlink-twitch-gui/bin.nix

···

       58
       58
        
           autoPatchelfHook

     

       59
       59
        
           cairo

     

       60
       60
        
           cups.lib

     

       61
       61
       -
           dbus.daemon.lib

     

       61
       61
       +
           dbus.lib

     

       62
       62
        
           expat

     

       63
       63
        
           gcc-unwrapped

     

       64
       64
        
           gdk-pixbuf

+1 -1

pkgs/applications/window-managers/phosh/default.nix

···

       101
       101
        
           runHook preCheck

     

       102
       102
        
           export NO_AT_BRIDGE=1

     

       103
       103
        
           xvfb-run -s '-screen 0 800x600x24' dbus-run-session \

     

       104
       104
       -
             --config-file=${dbus.daemon}/share/dbus-1/session.conf \

     

       104
       104
       +
             --config-file=${dbus}/share/dbus-1/session.conf \

     

       105
       105
        
             meson test --print-errorlogs

     

       106
       106
        
           runHook postCheck

     

       107
       107
        
         '';

+1 -1

pkgs/desktops/gnome/core/gnome-keyring/default.nix

···

       73
       73
        
         checkPhase = ''

     

       74
       74
        
           export HOME=$(mktemp -d)

     

       75
       75
        
           dbus-run-session \

     

       76
       76
       -
             --config-file=${dbus.daemon}/share/dbus-1/session.conf \

     

       76
       76
       +
             --config-file=${dbus}/share/dbus-1/session.conf \

     

       77
       77
        
             make check

     

       78
       78
        
         '';

     

       79
       79

+1 -1

pkgs/desktops/gnome/misc/geary/default.nix

···

       129
       129
        
           HOME=$TMPDIR \

     

       130
       130
        
           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} \

     

       131
       131
        
           xvfb-run -s '-screen 0 800x600x24' dbus-run-session \

     

       132
       132
       -
             --config-file=${dbus.daemon}/share/dbus-1/session.conf \

     

       132
       132
       +
             --config-file=${dbus}/share/dbus-1/session.conf \

     

       133
       133
        
             meson test -v --no-stdsplit

     

       134
       134
        
       

     

       135
       135
        
           runHook postCheck

+1 -1

pkgs/development/libraries/amtk/default.nix

···

       42
       42
        
         checkPhase = ''

     

       43
       43
        
           export NO_AT_BRIDGE=1

     

       44
       44
        
           ${xvfb-run}/bin/xvfb-run -s '-screen 0 800x600x24' dbus-run-session \

     

       45
       45
       -
             --config-file=${dbus.daemon}/share/dbus-1/session.conf \

     

       45
       45
       +
             --config-file=${dbus}/share/dbus-1/session.conf \

     

       46
       46
        
             meson test --print-errorlogs

     

       47
       47
        
         '';

     

       48
       48

-1

pkgs/development/libraries/dbus/default.nix

···

       108
       108
        
       

     

       109
       109
        
         passthru = {

     

       110
       110
        
           dbus-launch = "${dbus.lib}/bin/dbus-launch";

     

       111
       111
       -
           daemon = dbus.out;

     

       112
       111
        
         };

     

       113
       112
        
       

     

       114
       113
        
         meta = with lib; {

+1 -1

pkgs/development/libraries/glib/default.nix

···

       226
       226
        
           export XDG_RUNTIME_HOME="$TMP"

     

       227
       227
        
           export HOME="$TMP"

     

       228
       228
        
           export XDG_DATA_DIRS="${desktop-file-utils}/share:${shared-mime-info}/share"

     

       229
       229
       -
           export G_TEST_DBUS_DAEMON="${dbus.daemon}/bin/dbus-daemon"

     

       229
       229
       +
           export G_TEST_DBUS_DAEMON="${dbus}/bin/dbus-daemon"

     

       230
       230
        
           export PATH="$PATH:$(pwd)/gobject"

     

       231
       231
        
           echo "PATH=$PATH"

     

       232
       232
        
         '';

+1 -1

pkgs/development/libraries/gtksourceview/3.x.nix

···

       38
       38
        
           NO_AT_BRIDGE=1 \

     

       39
       39
        
           XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \

     

       40
       40
        
           xvfb-run -s '-screen 0 800x600x24' dbus-run-session \

     

       41
       41
       -
             --config-file=${dbus.daemon}/share/dbus-1/session.conf \

     

       41
       41
       +
             --config-file=${dbus}/share/dbus-1/session.conf \

     

       42
       42
        
             make check

     

       43
       43
        
         '';

     

       44
       44

+1 -1

pkgs/development/libraries/gtksourceview/4.x.nix

···

       79
       79
        
       

     

       80
       80
        
           XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \

     

       81
       81
        
           xvfb-run -s '-screen 0 800x600x24' dbus-run-session \

     

       82
       82
       -
             --config-file=${dbus.daemon}/share/dbus-1/session.conf \

     

       82
       82
       +
             --config-file=${dbus}/share/dbus-1/session.conf \

     

       83
       83
        
             meson test --no-rebuild --print-errorlogs

     

       84
       84
        
       

     

       85
       85
        
           runHook postCheck

+1 -1

pkgs/development/libraries/gtksourceview/5.x.nix

···

       81
       81
        
       

     

       82
       82
        
           XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \

     

       83
       83
        
           xvfb-run -s '-screen 0 800x600x24' dbus-run-session \

     

       84
       84
       -
             --config-file=${dbus.daemon}/share/dbus-1/session.conf \

     

       84
       84
       +
             --config-file=${dbus}/share/dbus-1/session.conf \

     

       85
       85
        
             meson test --no-rebuild --print-errorlogs

     

       86
       86
        
       

     

       87
       87
        
           runHook postCheck

+1 -1

pkgs/development/libraries/libdazzle/default.nix

···

       61
       61
        
       

     

       62
       62
        
         checkPhase = ''

     

       63
       63
        
           xvfb-run -s '-screen 0 800x600x24' dbus-run-session \

     

       64
       64
       -
             --config-file=${dbus.daemon}/share/dbus-1/session.conf \

     

       64
       64
       +
             --config-file=${dbus}/share/dbus-1/session.conf \

     

       65
       65
        
             meson test --print-errorlogs

     

       66
       66
        
         '';

     

       67
       67

+1 -1

pkgs/development/libraries/libhandy/0.x.nix

···

       39
       39
        
           NO_AT_BRIDGE=1 \

     

       40
       40
        
           XDG_DATA_DIRS="$XDG_DATA_DIRS:${hicolor-icon-theme}/share" \

     

       41
       41
        
           xvfb-run -s '-screen 0 800x600x24' dbus-run-session \

     

       42
       42
       -
             --config-file=${dbus.daemon}/share/dbus-1/session.conf \

     

       42
       42
       +
             --config-file=${dbus}/share/dbus-1/session.conf \

     

       43
       43
        
             meson test --print-errorlogs

     

       44
       44
        
         '';

     

       45
       45

+1 -1

pkgs/development/libraries/libsecret/default.nix

···

       87
       87
        
           runHook preCheck

     

       88
       88
        
       

     

       89
       89
        
           dbus-run-session \

     

       90
       90
       -
             --config-file=${dbus.daemon}/share/dbus-1/session.conf \

     

       90
       90
       +
             --config-file=${dbus}/share/dbus-1/session.conf \

     

       91
       91
        
             meson test --print-errorlogs

     

       92
       92
        
       

     

       93
       93
        
           runHook postCheck

+1 -1

pkgs/development/libraries/telepathy/qt/default.nix

···

       26
       26
        
         nativeBuildInputs = [ cmake pkg-config python ];

     

       27
       27
        
         propagatedBuildInputs = [ qtbase telepathy-farstream telepathy-glib ];

     

       28
       28
        
         buildInputs = [ dbus-glib ];

     

       29
       29
       -
         checkInputs = [ dbus.daemon dbus-python ];

     

       29
       29
       +
         checkInputs = [ dbus dbus-python ];

     

       30
       30
        
       

     

       31
       31
        
         # No point in building tests if they are not run

     

       32
       32
        
         # On 0.9.7, they do not even build with QT4

+1 -1

pkgs/development/libraries/tracker/default.nix

···

       117
       117
        
           runHook preCheck

     

       118
       118
        
       

     

       119
       119
        
           dbus-run-session \

     

       120
       120
       -
             --config-file=${dbus.daemon}/share/dbus-1/session.conf \

     

       120
       120
       +
             --config-file=${dbus}/share/dbus-1/session.conf \

     

       121
       121
        
             meson test \

     

       122
       122
        
               --timeout-multiplier 2 \

     

       123
       123
        
               --print-errorlogs

+1 -1

pkgs/development/python-modules/dbus-next/default.nix

···

       29
       29
        
         # test_tcp_connection_with_forwarding fails due to dbus

     

       30
       30
        
         # creating unix socket anyway on v1.14.4

     

       31
       31
        
         checkPhase = ''

     

       32
       32
       -
           dbus-run-session --config-file=${dbus.daemon}/share/dbus-1/session.conf \

     

       32
       32
       +
           dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf \

     

       33
       33
        
             ${python.interpreter} -m pytest -sv --cov=dbus_next \

     

       34
       34
        
             -k "not test_peer_interface and not test_tcp_connection_with_forwarding"

     

       35
       35
        
         '';

+1 -1

pkgs/development/python-modules/dogtail/default.nix

···

       45
       45
        
           # export NO_AT_BRIDGE=1

     

       46
       46
        
           gsettings set org.gnome.desktop.interface toolkit-accessibility true

     

       47
       47
        
           xvfb-run -s '-screen 0 800x600x24' dbus-run-session \

     

       48
       48
       -
             --config-file=${dbus.daemon}/share/dbus-1/session.conf \

     

       48
       48
       +
             --config-file=${dbus}/share/dbus-1/session.conf \

     

       49
       49
        
             ${python.interpreter} nix_run_setup test

     

       50
       50
        
           runHook postCheck

     

       51
       51
        
         '';

+1 -1

pkgs/development/python-modules/notify-py/default.nix

···

       61
       61
        
           PATH="$TMP/bin:$PATH" pytest

     

       62
       62
        
         '' else if stdenv.isLinux then ''

     

       63
       63
        
           dbus-run-session \

     

       64
       64
       -
             --config-file=${dbus.daemon}/share/dbus-1/session.conf \

     

       64
       64
       +
             --config-file=${dbus}/share/dbus-1/session.conf \

     

       65
       65
        
             pytest

     

       66
       66
        
         '' else ''

     

       67
       67
        
           pytest

+1 -1

pkgs/tools/inputmethods/ibus/default.nix

···

       52
       52
        
           nativeBuildInputs = [ makeWrapper ];

     

       53
       53
        
         } ''

     

       54
       54
        
             makeWrapper ${dbus}/bin/dbus-launch $out/bin/dbus-launch \

     

       55
       55
       -
               --add-flags --config-file=${dbus.daemon}/share/dbus-1/session.conf

     

       55
       55
       +
               --add-flags --config-file=${dbus}/share/dbus-1/session.conf

     

       56
       56
        
         '';

     

       57
       57
        
       in

     

       58
       58

+1 -1

pkgs/tools/networking/modemmanager/default.nix

···

       42
       42
        
         # install check instead, when those paths will have been created.

     

       43
       43
        
         doInstallCheck = true;

     

       44
       44
        
         preInstallCheck = ''

     

       45
       45
       -
           export G_TEST_DBUS_DAEMON="${dbus.daemon}/bin/dbus-daemon"

     

       45
       45
       +
           export G_TEST_DBUS_DAEMON="${dbus}/bin/dbus-daemon"

     

       46
       46
        
           patchShebangs tools/tests/test-wrapper.sh

     

       47
       47
        
         '';

     

       48
       48
        
         installCheckTarget = "check";