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

Merge pull request #122003 from hercules-ci/rename-xvfb-run

Browse Source 
treewide: xvfb_run -> xvfb-run
This commit is contained in:
Robert Hensing 2021-05-08 16:26:48 +02:00 committed by GitHub
commit 8823855ce3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
40 changed files with 78 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, python3, wrapGAppsHook, gettext, libsoup, gnome, gtk3, gdk-pixbuf, librsvg, { lib, stdenv, fetchurl, python3, wrapGAppsHook, gettext, libsoup, gnome, gtk3, gdk-pixbuf, librsvg,
tag ? "", xvfb_run, dbus, glibcLocales, glib, glib-networking, gobject-introspection, hicolor-icon-theme, tag ? "", xvfb-run, dbus, glibcLocales, glib, glib-networking, gobject-introspection, hicolor-icon-theme,
gst_all_1, withGstPlugins ? true, gst_all_1, withGstPlugins ? true,
xineBackend ? false, xine-lib, xineBackend ? false, xine-lib,
withDbusPython ? false, withPyInotify ? false, withMusicBrainzNgs ? false, withPahoMqtt ? false, withDbusPython ? false, withPyInotify ? false, withMusicBrainzNgs ? false, withPahoMqtt ? false,
@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
nativeBuildInputs = [ wrapGAppsHook gettext ]; nativeBuildInputs = [ wrapGAppsHook gettext ];
checkInputs = [ gdk-pixbuf hicolor-icon-theme ] ++ (with python3.pkgs; [ pytest pytest_xdist polib xvfb_run dbus.daemon glibcLocales ]); checkInputs = [ gdk-pixbuf hicolor-icon-theme ] ++ (with python3.pkgs; [ pytest pytest_xdist polib xvfb-run dbus.daemon glibcLocales ]);
buildInputs = [ gnome.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk-pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ] buildInputs = [ gnome.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk-pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ]
++ (if xineBackend then [ xine-lib ] else with gst_all_1; ++ (if xineBackend then [ xine-lib ] else with gst_all_1;

4
pkgs/applications/audio/sublime-music/default.nix
View File

@ -5,7 +5,7 @@
, gtk3 , gtk3
, pango , pango
, wrapGAppsHook , wrapGAppsHook
, xvfb_run , xvfb-run
, chromecastSupport ? false , chromecastSupport ? false
, serverSupport ? false , serverSupport ? false
, keyringSupport ? true , keyringSupport ? true
@ -66,7 +66,7 @@ python3Packages.buildPythonApplication rec {
pytest pytest
pytest-cov pytest-cov
]; ];
checkPhase = "${xvfb_run}/bin/xvfb-run pytest"; checkPhase = "${xvfb-run}/bin/xvfb-run pytest";
# Also run the python import check for sanity # Also run the python import check for sanity
pythonImportsCheck = [ "sublime_music" ]; pythonImportsCheck = [ "sublime_music" ];

4
pkgs/applications/editors/gnome-builder/default.nix
View File

@ -34,7 +34,7 @@
, webkitgtk , webkitgtk
, wrapGAppsHook , wrapGAppsHook
, dbus , dbus
, xvfb_run , xvfb-run
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
checkInputs = [ checkInputs = [
dbus dbus
xvfb_run xvfb-run
]; ];
outputs = [ "out" "devdoc" ]; outputs = [ "out" "devdoc" ];

4
pkgs/applications/graphics/gscan2pdf/default.nix
View File

@ -4,7 +4,7 @@
# runtime dependencies # runtime dependencies
imagemagick, libtiff, djvulibre, poppler_utils, ghostscript, unpaper, pdftk, imagemagick, libtiff, djvulibre, poppler_utils, ghostscript, unpaper, pdftk,
# test dependencies # test dependencies
xvfb_run, liberation_ttf, file, tesseract }: xvfb-run, liberation_ttf, file, tesseract }:
with lib; with lib;
@ -94,7 +94,7 @@ perlPackages.buildPerlPackage rec {
unpaper unpaper
pdftk pdftk
xvfb_run xvfb-run
file file
tesseract # tests are expecting tesseract 3.x precisely tesseract # tests are expecting tesseract 3.x precisely
] ++ (with perlPackages; [ ] ++ (with perlPackages; [

4
pkgs/applications/graphics/vimiv/default.nix
View File

@ -2,7 +2,7 @@
, gnome , gnome
# Test requirements # Test requirements
, dbus, xvfb_run, xdotool , dbus, xvfb-run, xdotool
}: }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
@ -37,7 +37,7 @@ python3Packages.buildPythonApplication rec {
vimiv/imageactions.py vimiv/imageactions.py
''; '';
checkInputs = [ python3Packages.nose dbus.daemon xvfb_run xdotool ]; checkInputs = [ python3Packages.nose dbus.daemon xvfb-run xdotool ];
buildInputs = [ gnome.adwaita-icon-theme librsvg ]; buildInputs = [ gnome.adwaita-icon-theme librsvg ];
propagatedBuildInputs = with python3Packages; [ pillow pygobject3 gtk3 ]; propagatedBuildInputs = with python3Packages; [ pillow pygobject3 gtk3 ];

4
pkgs/applications/misc/girara/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, meson, ninja, pkg-config, check, dbus, xvfb_run, glib, gtk, gettext, libiconv, json_c, libintl { lib, stdenv, fetchurl, meson, ninja, pkg-config, check, dbus, xvfb-run, glib, gtk, gettext, libiconv, json_c, libintl
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1n3i960b458172mc3pkq7m9dn5qxry6fms3c3k06v27cjp5whsyf"; sha256 = "1n3i960b458172mc3pkq7m9dn5qxry6fms3c3k06v27cjp5whsyf";
}; };
nativeBuildInputs = [ meson ninja pkg-config gettext check dbus xvfb_run ]; nativeBuildInputs = [ meson ninja pkg-config gettext check dbus xvfb-run ];
buildInputs = [ libintl libiconv json_c ]; buildInputs = [ libintl libiconv json_c ];
propagatedBuildInputs = [ glib gtk ]; propagatedBuildInputs = [ glib gtk ];

4
pkgs/applications/misc/pytrainer/default.nix
View File

@ -13,7 +13,7 @@
, tzdata , tzdata
, webkitgtk , webkitgtk
, wrapGAppsHook , wrapGAppsHook
, xvfb_run , xvfb-run
}: }:
let let
@ -66,7 +66,7 @@ in python.pkgs.buildPythonApplication rec {
checkInputs = [ checkInputs = [
glibcLocales glibcLocales
perl perl
xvfb_run xvfb-run
] ++ (with python.pkgs; [ ] ++ (with python.pkgs; [
mysqlclient mysqlclient
psycopg2 psycopg2

4
pkgs/applications/misc/ulauncher/default.nix
View File

@ -14,7 +14,7 @@
, libappindicator , libappindicator
, intltool , intltool
, wmctrl , wmctrl
, xvfb_run , xvfb-run
, librsvg , librsvg
}: }:
@ -66,7 +66,7 @@ python3Packages.buildPythonApplication rec {
mock mock
pytest pytest
pytest-mock pytest-mock
xvfb_run xvfb-run
]; ];
patches = [ patches = [

4
pkgs/applications/networking/calls/default.nix
View File

@ -21,7 +21,7 @@
, dbus , dbus
, vala , vala
, wrapGAppsHook , wrapGAppsHook
, xvfb_run , xvfb-run
, gtk-doc , gtk-doc
, docbook-xsl-nons , docbook-xsl-nons
, docbook_xml_dtd_43 , docbook_xml_dtd_43
@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
checkInputs = [ checkInputs = [
dbus dbus
xvfb_run xvfb-run
]; ];
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";

4
pkgs/applications/networking/flent/default.nix
View File

@ -1,5 +1,5 @@
{ lib, buildPythonApplication, fetchPypi, matplotlib, procps, pyqt5, python { lib, buildPythonApplication, fetchPypi, matplotlib, procps, pyqt5, python
, pythonPackages, qt5, sphinx, xvfb_run }: , pythonPackages, qt5, sphinx, xvfb-run }:
buildPythonApplication rec { buildPythonApplication rec {
pname = "flent"; pname = "flent";
@ -12,7 +12,7 @@ buildPythonApplication rec {
buildInputs = [ sphinx ]; buildInputs = [ sphinx ];
nativeBuildInputs = [ qt5.wrapQtAppsHook ]; nativeBuildInputs = [ qt5.wrapQtAppsHook ];
propagatedBuildInputs = [ matplotlib procps pyqt5 ]; propagatedBuildInputs = [ matplotlib procps pyqt5 ];
checkInputs = [ procps pythonPackages.mock pyqt5 xvfb_run ]; checkInputs = [ procps pythonPackages.mock pyqt5 xvfb-run ];
checkPhase = '' checkPhase = ''
cat >test-runner <<EOF cat >test-runner <<EOF

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

@ -5,7 +5,7 @@
, glib-networking , glib-networking
# Test dependencies # Test dependencies
, xvfb_run, dbus , xvfb-run, dbus
# Optional dependencies # Optional dependencies
, enableJingle ? true, farstream, gstreamer, gst-plugins-base, gst-libav, gst-plugins-good, libnice , enableJingle ? true, farstream, gstreamer, gst-plugins-base, gst-libav, gst-plugins-good, libnice
@ -52,7 +52,7 @@ 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.daemon ];
checkPhase = '' checkPhase = ''
# https://dev.gajim.org/gajim/gajim/-/issues/10478 # https://dev.gajim.org/gajim/gajim/-/issues/10478

4
pkgs/applications/office/gtg/default.nix
View File

@ -11,7 +11,7 @@
, pango , pango
, gdk-pixbuf , gdk-pixbuf
, gobject-introspection , gobject-introspection
, xvfb_run , xvfb-run
}: }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
@ -53,7 +53,7 @@ python3Packages.buildPythonApplication rec {
checkInputs = with python3Packages; [ checkInputs = with python3Packages; [
nose nose
mock mock
xvfb_run xvfb-run
]; ];
preBuild = '' preBuild = ''

4
pkgs/applications/office/kmymoney/default.nix
View File

@ -8,7 +8,7 @@
, sqlcipher , sqlcipher
# Needed for running tests: # Needed for running tests:
, qtbase, xvfb_run , qtbase, xvfb-run
, python2, python3Packages , python2, python3Packages
}: }:
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
''; '';
doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform; doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform;
installCheckInputs = [ xvfb_run ]; installCheckInputs = [ xvfb-run ];
installCheckPhase = installCheckPhase =
lib.optionalString doInstallCheck '' lib.optionalString doInstallCheck ''
xvfb-run -s '-screen 0 1024x768x24' make test \ xvfb-run -s '-screen 0 1024x768x24' make test \

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

@ -4,7 +4,7 @@
, cairo , cairo
, gnome , gnome
, librsvg , librsvg
, xvfb_run , xvfb-run
, dbus , dbus
, libnotify , libnotify
, wrapGAppsHook , wrapGAppsHook
@ -53,7 +53,7 @@ python3Packages.buildPythonApplication rec {
done done
''; '';
checkInputs = [ xvfb_run dbus.daemon ]; checkInputs = [ xvfb-run dbus.daemon ];
nativeBuildInputs = [ nativeBuildInputs = [
wrapGAppsHook wrapGAppsHook

4
pkgs/applications/window-managers/i3/default.nix
View File

@ -1,7 +1,7 @@
{ fetchurl, lib, stdenv, pkg-config, makeWrapper, meson, ninja, installShellFiles, libxcb, xcbutilkeysyms { fetchurl, lib, stdenv, pkg-config, makeWrapper, meson, ninja, installShellFiles, libxcb, xcbutilkeysyms
, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev , xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev
, yajl, xcb-util-cursor, perl, pango, perlPackages, libxkbcommon , yajl, xcb-util-cursor, perl, pango, perlPackages, libxkbcommon
, xorgserver, xvfb_run }: , xorgserver, xvfb-run }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "i3"; pname = "i3";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango
perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun
perlPackages.ExtUtilsPkgConfig perlPackages.InlineC perlPackages.ExtUtilsPkgConfig perlPackages.InlineC
xorgserver xvfb_run xorgserver xvfb-run
]; ];
configureFlags = [ "--disable-builddir" ]; configureFlags = [ "--disable-builddir" ];

4
pkgs/applications/window-managers/phosh/default.nix
View File

@ -18,7 +18,7 @@
, upower , upower
, wayland , wayland
, dbus , dbus
, xvfb_run , xvfb-run
, phoc , phoc
, feedbackd , feedbackd
, networkmanager , networkmanager
@ -98,7 +98,7 @@ in stdenv.mkDerivation rec {
checkInputs = [ checkInputs = [
dbus dbus
xvfb_run xvfb-run
]; ];
# Temporarily disabled - Test is broken (SIGABRT) # Temporarily disabled - Test is broken (SIGABRT)

4
pkgs/desktops/cinnamon/cjs/default.nix
View File

@ -20,7 +20,7 @@
, meson , meson
, sysprof , sysprof
, dbus , dbus
, xvfb_run , xvfb-run
, ninja , ninja
, makeWrapper , makeWrapper
, which , which
@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
]; ];
checkInputs = [ checkInputs = [
xvfb_run xvfb-run
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/desktops/gnome/core/totem/default.nix
View File

@ -25,7 +25,7 @@
, gnome-desktop , gnome-desktop
, gsettings-desktop-schemas , gsettings-desktop-schemas
, gdk-pixbuf , gdk-pixbuf
, xvfb_run , xvfb-run
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
]; ];
checkInputs = [ checkInputs = [
xvfb_run xvfb-run
]; ];
mesonFlags = [ mesonFlags = [

4
pkgs/desktops/gnome/misc/geary/default.nix
View File

@ -29,7 +29,7 @@
, python3 , python3
, gnutls , gnutls
, cacert , cacert
, xvfb_run , xvfb-run
, glibcLocales , glibcLocales
, dbus , dbus
, shared-mime-info , shared-mime-info
@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
dbus dbus
gnutls # for certtool gnutls # for certtool
cacert # trust store for glib-networking cacert # trust store for glib-networking
xvfb_run xvfb-run
glibcLocales # required by Geary.ImapDb.DatabaseTest/utf8_case_insensitive_collation glibcLocales # required by Geary.ImapDb.DatabaseTest/utf8_case_insensitive_collation
]; ];

4
pkgs/development/libraries/amtk/default.nix
View File

@ -7,7 +7,7 @@
, gobject-introspection , gobject-introspection
, gnome , gnome
, dbus , dbus
, xvfb_run , xvfb-run
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
doCheck = stdenv.isLinux; doCheck = stdenv.isLinux;
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.daemon}/share/dbus-1/session.conf \
meson test --print-errorlogs meson test --print-errorlogs
''; '';

4
pkgs/development/libraries/gjs/default.nix
View File

@ -19,7 +19,7 @@
, harfbuzz , harfbuzz
, makeWrapper , makeWrapper
, which , which
, xvfb_run , xvfb-run
, nixosTests , nixosTests
}: }:
@ -65,7 +65,7 @@ in stdenv.mkDerivation rec {
]; ];
checkInputs = [ checkInputs = [
xvfb_run xvfb-run
] ++ testDeps; ] ++ testDeps;
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/libraries/gtkmm/4.x.nix
View File

@ -12,7 +12,7 @@
, epoxy , epoxy
, gnome , gnome
, makeFontsConf , makeFontsConf
, xvfb_run , xvfb-run
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
]; ];
checkInputs = [ checkInputs = [
xvfb_run xvfb-run
]; ];
# Tests require fontconfig. # Tests require fontconfig.

4
pkgs/development/libraries/gtksourceview/3.x.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, atk, cairo, glib, gtk3, pango, vala { lib, stdenv, fetchurl, pkg-config, atk, cairo, glib, gtk3, pango, vala
, libxml2, perl, intltool, gettext, gobject-introspection, dbus, xvfb_run, shared-mime-info }: , libxml2, perl, intltool, gettext, gobject-introspection, dbus, xvfb-run, shared-mime-info }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gtksourceview"; pname = "gtksourceview";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config intltool perl gobject-introspection vala ]; nativeBuildInputs = [ pkg-config intltool perl gobject-introspection vala ];
checkInputs = [ xvfb_run dbus ]; checkInputs = [ xvfb-run dbus ];
buildInputs = [ atk cairo glib pango libxml2 gettext ]; buildInputs = [ atk cairo glib pango libxml2 gettext ];

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

@ -18,7 +18,7 @@
, gnome , gnome
, gobject-introspection , gobject-introspection
, dbus , dbus
, xvfb_run , xvfb-run
, shared-mime-info , shared-mime-info
}: }:
@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
]; ];
checkInputs = [ checkInputs = [
xvfb_run xvfb-run
dbus dbus
]; ];

4
pkgs/development/libraries/gtksourceview/5.x.nix
View File

@ -16,7 +16,7 @@
, gnome , gnome
, gobject-introspection , gobject-introspection
, dbus , dbus
, xvfb_run , xvfb-run
, shared-mime-info , shared-mime-info
}: }:
@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
]; ];
checkInputs = [ checkInputs = [
xvfb_run xvfb-run
dbus dbus
]; ];

4
pkgs/development/libraries/libadwaita/default.nix
View File

@ -10,7 +10,7 @@
, vala , vala
, gobject-introspection , gobject-introspection
, gtk4 , gtk4
, xvfb_run , xvfb-run
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
]; ];
checkInputs = [ checkInputs = [
xvfb_run xvfb-run
]; ];
doCheck = true; doCheck = true;

4
pkgs/development/libraries/libdazzle/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, ninja, meson, pkg-config, vala, gobject-introspection, libxml2 { lib, stdenv, fetchurl, ninja, meson, pkg-config, vala, gobject-introspection, libxml2
, gtk-doc, docbook_xsl, docbook_xml_dtd_43, dbus, xvfb_run, glib, gtk3, gnome }: , gtk-doc, docbook_xsl, docbook_xml_dtd_43, dbus, xvfb-run, glib, gtk3, gnome }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libdazzle"; pname = "libdazzle";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "19abrrjsyjhhl1xflnb0likb9wwzz78fa1mk2b064rpscmz9mafv"; sha256 = "19abrrjsyjhhl1xflnb0likb9wwzz78fa1mk2b064rpscmz9mafv";
}; };
nativeBuildInputs = [ ninja meson pkg-config vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb_run glib ]; nativeBuildInputs = [ ninja meson pkg-config vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb-run glib ];
buildInputs = [ glib gtk3 ]; buildInputs = [ glib gtk3 ];
mesonFlags = [ mesonFlags = [

4
pkgs/development/libraries/libhandy/0.x.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitLab, meson, ninja, pkg-config, gobject-introspection, vala { lib, stdenv, fetchFromGitLab, meson, ninja, pkg-config, gobject-introspection, vala
, gtk-doc, docbook_xsl, docbook_xml_dtd_43 , gtk-doc, docbook_xsl, docbook_xml_dtd_43
, gtk3, gnome , gtk3, gnome
, dbus, xvfb_run, libxml2 , dbus, xvfb-run, libxml2
, hicolor-icon-theme , hicolor-icon-theme
}: }:
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
gtk-doc docbook_xsl docbook_xml_dtd_43 gtk-doc docbook_xsl docbook_xml_dtd_43
]; ];
buildInputs = [ gnome.gnome-desktop gtk3 libxml2 ]; buildInputs = [ gnome.gnome-desktop gtk3 libxml2 ];
checkInputs = [ dbus xvfb_run hicolor-icon-theme ]; checkInputs = [ dbus xvfb-run hicolor-icon-theme ];
mesonFlags = [ mesonFlags = [
"-Dgtk_doc=true" "-Dgtk_doc=true"

4
pkgs/development/libraries/libhandy/default.nix
View File

@ -13,7 +13,7 @@
, enableGlade ? false , enableGlade ? false
, glade , glade
, dbus , dbus
, xvfb_run , xvfb-run
, libxml2 , libxml2
, gdk-pixbuf , gdk-pixbuf
, librsvg , librsvg
@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
checkInputs = [ checkInputs = [
dbus dbus
xvfb_run xvfb-run
at-spi2-atk at-spi2-atk
at-spi2-core at-spi2-core
librsvg librsvg

4
pkgs/development/libraries/libsecret/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, fetchpatch, glib, pkg-config, gettext, libxslt, python3 { lib, stdenv, fetchurl, fetchpatch, glib, pkg-config, gettext, libxslt, python3
, docbook_xsl, docbook_xml_dtd_42 , libgcrypt, gobject-introspection, vala , docbook_xsl, docbook_xml_dtd_42 , libgcrypt, gobject-introspection, vala
, gtk-doc, gnome, gjs, libintl, dbus, xvfb_run }: , gtk-doc, gnome, gjs, libintl, dbus, xvfb-run }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libsecret"; pname = "libsecret";
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
installCheckInputs = [ installCheckInputs = [
python3 python3.pkgs.dbus-python python3.pkgs.pygobject3 xvfb_run dbus gjs python3 python3.pkgs.dbus-python python3.pkgs.pygobject3 xvfb-run dbus gjs
]; ];
# needs to run after install because typelibs point to absolute paths # needs to run after install because typelibs point to absolute paths

4
pkgs/development/python-modules/dogtail/default.nix
View File

@ -10,7 +10,7 @@
, gsettings-desktop-schemas , gsettings-desktop-schemas
, fetchurl , fetchurl
, dbus , dbus
, xvfb_run , xvfb-run
, wrapGAppsHook , wrapGAppsHook
# , fetchPypi # , fetchPypi
}: }:
@ -33,7 +33,7 @@ buildPythonPackage {
./nix-support.patch ./nix-support.patch
]; ];
nativeBuildInputs = [ gobject-introspection dbus xvfb_run wrapGAppsHook ]; # for setup hooks nativeBuildInputs = [ gobject-introspection dbus xvfb-run wrapGAppsHook ]; # for setup hooks
propagatedBuildInputs = [ at-spi2-core gtk3 pygobject3 pyatspi pycairo ]; propagatedBuildInputs = [ at-spi2-core gtk3 pygobject3 pyatspi pycairo ];
strictDeps = false; # issue 56943 strictDeps = false; # issue 56943

4
pkgs/development/python-modules/liblarch/default.nix
View File

@ -3,7 +3,7 @@
, buildPythonPackage , buildPythonPackage
, python , python
, pygobject3 , pygobject3
, xvfb_run , xvfb-run
, gobject-introspection , gobject-introspection
, gtk3 , gtk3
, pythonOlder , pythonOlder
@ -32,7 +32,7 @@ buildPythonPackage rec {
checkPhase = '' checkPhase = ''
runHook preCheck runHook preCheck
${xvfb_run}/bin/xvfb-run -s '-screen 0 800x600x24' \ ${xvfb-run}/bin/xvfb-run -s '-screen 0 800x600x24' \
${python.interpreter} nix_run_setup test ${python.interpreter} nix_run_setup test
runHook postCheck runHook postCheck
''; '';

4
pkgs/development/python-modules/pystray/default.nix
View File

@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchFromGitHub { lib, buildPythonPackage, fetchFromGitHub
, pillow, xlib, six, xvfb_run, sphinx }: , pillow, xlib, six, xvfb-run, sphinx }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pystray"; pname = "pystray";
@ -14,7 +14,7 @@ buildPythonPackage rec {
nativeBuildInputs = [ sphinx ]; nativeBuildInputs = [ sphinx ];
propagatedBuildInputs = [ pillow xlib six ]; propagatedBuildInputs = [ pillow xlib six ];
checkInputs = [ xvfb_run ]; checkInputs = [ xvfb-run ];
checkPhase = '' checkPhase = ''
rm tests/icon_tests.py # test needs user input rm tests/icon_tests.py # test needs user input

4
pkgs/development/python-modules/pywebview/default.nix
View File

@ -6,7 +6,7 @@
, pytest , pytest
, pythonOlder , pythonOlder
, qt5 , qt5
, xvfb_run , xvfb-run
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -31,7 +31,7 @@ buildPythonPackage rec {
checkInputs = [ checkInputs = [
pytest pytest
xvfb_run xvfb-run
]; ];
checkPhase = '' checkPhase = ''

4
pkgs/development/python-modules/xdot/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k, python3, xvfb_run { lib, buildPythonPackage, fetchPypi, isPy3k, python3, xvfb-run
, wrapGAppsHook, gobject-introspection, pygobject3, graphviz, gtk3, numpy }: , wrapGAppsHook, gobject-introspection, pygobject3, graphviz, gtk3, numpy }:
buildPythonPackage rec { buildPythonPackage rec {
@ -13,7 +13,7 @@ buildPythonPackage rec {
disabled = !isPy3k; disabled = !isPy3k;
nativeBuildInputs = [ wrapGAppsHook ]; nativeBuildInputs = [ wrapGAppsHook ];
propagatedBuildInputs = [ gobject-introspection pygobject3 graphviz gtk3 numpy ]; propagatedBuildInputs = [ gobject-introspection pygobject3 graphviz gtk3 numpy ];
checkInputs = [ xvfb_run ]; checkInputs = [ xvfb-run ];
checkPhase = '' checkPhase = ''
xvfb-run -s '-screen 0 800x600x24' ${python3.interpreter} nix_run_setup test xvfb-run -s '-screen 0 800x600x24' ${python3.interpreter} nix_run_setup test

6
pkgs/development/r-modules/generic-builder.nix
View File

@ -1,10 +1,10 @@
{ stdenv, lib, R, libcxx, xvfb_run, util-linux, Cocoa, Foundation, gettext, gfortran }: { stdenv, lib, R, libcxx, xvfb-run, util-linux, Cocoa, Foundation, gettext, gfortran }:
{ name, buildInputs ? [], requireX ? false, ... } @ attrs: { name, buildInputs ? [], requireX ? false, ... } @ attrs:
stdenv.mkDerivation ({ stdenv.mkDerivation ({
buildInputs = buildInputs ++ [R gettext] ++ buildInputs = buildInputs ++ [R gettext] ++
lib.optionals requireX [util-linux xvfb_run] ++ lib.optionals requireX [util-linux xvfb-run] ++
lib.optionals stdenv.isDarwin [Cocoa Foundation gfortran]; lib.optionals stdenv.isDarwin [Cocoa Foundation gfortran];
NIX_CFLAGS_COMPILE = NIX_CFLAGS_COMPILE =
@ -29,7 +29,7 @@ stdenv.mkDerivation ({
rCommand = if requireX then rCommand = if requireX then
# Unfortunately, xvfb-run has a race condition even with -a option, so that # Unfortunately, xvfb-run has a race condition even with -a option, so that
# we acquire a lock explicitly. # we acquire a lock explicitly.
"flock ${xvfb_run} xvfb-run -a -e xvfb-error R" "flock ${xvfb-run} xvfb-run -a -e xvfb-error R"
else else
"R"; "R";

4
pkgs/tools/misc/xvfb-run/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, makeWrapper, xorgserver, getopt { lib, stdenv, fetchurl, makeWrapper, xorgserver, getopt
, xauth, util-linux, which, fontsConf, gawk, coreutils }: , xauth, util-linux, which, fontsConf, gawk, coreutils }:
let let
xvfb_run = fetchurl { xvfb-run = fetchurl {
name = "xvfb-run"; name = "xvfb-run";
# https://git.archlinux.org/svntogit/packages.git/?h=packages/xorg-server # https://git.archlinux.org/svntogit/packages.git/?h=packages/xorg-server
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/xvfb-run?h=packages/xorg-server&id=9cb733cefa92af3fca608fb051d5251160c9bbff"; url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/xvfb-run?h=packages/xorg-server&id=9cb733cefa92af3fca608fb051d5251160c9bbff";
@ -13,7 +13,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildCommand = '' buildCommand = ''
mkdir -p $out/bin mkdir -p $out/bin
cp ${xvfb_run} $out/bin/xvfb-run cp ${xvfb-run} $out/bin/xvfb-run
chmod a+x $out/bin/xvfb-run chmod a+x $out/bin/xvfb-run
patchShebangs $out/bin/xvfb-run patchShebangs $out/bin/xvfb-run

1
pkgs/top-level/aliases.nix
View File

@ -868,6 +868,7 @@ mapAliases ({
xlibs = xorg; # added 2015-09 xlibs = xorg; # added 2015-09
xpraGtk3 = xpra; # added 2018-09-13 xpraGtk3 = xpra; # added 2018-09-13
xv = xxv; # added 2020-02-22 xv = xxv; # added 2020-02-22
xvfb_run = xvfb-run; # added 2021-05-07
yacc = bison; # moved from top-level 2021-03-14 yacc = bison; # moved from top-level 2021-03-14
youtubeDL = youtube-dl; # added 2014-10-26 youtubeDL = youtube-dl; # added 2014-10-26
ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead"; ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead";

2
pkgs/top-level/all-packages.nix
View File

@ -9764,7 +9764,7 @@ in
xxv = callPackage ../tools/misc/xxv {}; xxv = callPackage ../tools/misc/xxv {};
xvfb_run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; }; xvfb-run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; };
xvkbd = callPackage ../tools/X11/xvkbd {}; xvkbd = callPackage ../tools/X11/xvkbd {};

2
pkgs/top-level/perl-packages.nix
View File

@ -9248,7 +9248,7 @@ let
propagatedBuildInputs = [ Readonly Gtk3 ]; propagatedBuildInputs = [ Readonly Gtk3 ];
checkInputs = [ TestDifferences PerlMagick TryTiny TestMockObject CarpAlways pkgs.librsvg ]; checkInputs = [ TestDifferences PerlMagick TryTiny TestMockObject CarpAlways pkgs.librsvg ];
checkPhase = '' checkPhase = ''
${pkgs.xvfb_run}/bin/xvfb-run -s '-screen 0 800x600x24' \ ${pkgs.xvfb-run}/bin/xvfb-run -s '-screen 0 800x600x24' \
make test make test
''; '';
meta = { meta = {