From 8e3c5eb5013446fab495144e857f4d34fce1de71 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sat, 8 May 2021 15:45:03 +0200
Subject: [PATCH] treewide: xvfb_run -> xvfb-run
---
pkgs/applications/audio/quodlibet/default.nix | 4 ++--
pkgs/applications/audio/sublime-music/default.nix | 4 ++--
pkgs/applications/editors/gnome-builder/default.nix | 4 ++--
pkgs/applications/graphics/gscan2pdf/default.nix | 4 ++--
pkgs/applications/graphics/vimiv/default.nix | 4 ++--
pkgs/applications/misc/girara/default.nix | 4 ++--
pkgs/applications/misc/pytrainer/default.nix | 4 ++--
pkgs/applications/misc/ulauncher/default.nix | 4 ++--
pkgs/applications/networking/calls/default.nix | 4 ++--
pkgs/applications/networking/flent/default.nix | 4 ++--
.../networking/instant-messengers/gajim/default.nix | 4 ++--
pkgs/applications/office/gtg/default.nix | 4 ++--
pkgs/applications/office/kmymoney/default.nix | 4 ++--
pkgs/applications/office/paperwork/paperwork-gtk.nix | 4 ++--
pkgs/applications/window-managers/i3/default.nix | 4 ++--
pkgs/applications/window-managers/phosh/default.nix | 4 ++--
pkgs/desktops/cinnamon/cjs/default.nix | 4 ++--
pkgs/desktops/gnome/core/totem/default.nix | 4 ++--
pkgs/desktops/gnome/misc/geary/default.nix | 4 ++--
pkgs/development/libraries/amtk/default.nix | 4 ++--
pkgs/development/libraries/gjs/default.nix | 4 ++--
pkgs/development/libraries/gtkmm/4.x.nix | 4 ++--
pkgs/development/libraries/gtksourceview/3.x.nix | 4 ++--
pkgs/development/libraries/gtksourceview/4.x.nix | 4 ++--
pkgs/development/libraries/gtksourceview/5.x.nix | 4 ++--
pkgs/development/libraries/libadwaita/default.nix | 4 ++--
pkgs/development/libraries/libdazzle/default.nix | 4 ++--
pkgs/development/libraries/libhandy/0.x.nix | 4 ++--
pkgs/development/libraries/libhandy/default.nix | 4 ++--
pkgs/development/libraries/libsecret/default.nix | 4 ++--
pkgs/development/python-modules/dogtail/default.nix | 4 ++--
pkgs/development/python-modules/liblarch/default.nix | 4 ++--
pkgs/development/python-modules/pystray/default.nix | 4 ++--
pkgs/development/python-modules/pywebview/default.nix | 4 ++--
pkgs/development/python-modules/xdot/default.nix | 4 ++--
pkgs/development/r-modules/generic-builder.nix | 6 +++---
pkgs/tools/misc/xvfb-run/default.nix | 4 ++--
pkgs/top-level/perl-packages.nix | 2 +-
38 files changed, 76 insertions(+), 76 deletions(-)
diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index 2a170b3ccfd8..52e8b4f8183d 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -1,5 +1,5 @@
{ 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,
xineBackend ? false, xine-lib,
withDbusPython ? false, withPyInotify ? false, withMusicBrainzNgs ? false, withPahoMqtt ? false,
@@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
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 ]
++ (if xineBackend then [ xine-lib ] else with gst_all_1;
diff --git a/pkgs/applications/audio/sublime-music/default.nix b/pkgs/applications/audio/sublime-music/default.nix
index cd43b5d53a27..3d25ec3cdbb0 100644
--- a/pkgs/applications/audio/sublime-music/default.nix
+++ b/pkgs/applications/audio/sublime-music/default.nix
@@ -5,7 +5,7 @@
, gtk3
, pango
, wrapGAppsHook
-, xvfb_run
+, xvfb-run
, chromecastSupport ? false
, serverSupport ? false
, keyringSupport ? true
@@ -66,7 +66,7 @@ python3Packages.buildPythonApplication rec {
pytest
pytest-cov
];
- checkPhase = "${xvfb_run}/bin/xvfb-run pytest";
+ checkPhase = "${xvfb-run}/bin/xvfb-run pytest";
# Also run the python import check for sanity
pythonImportsCheck = [ "sublime_music" ];
diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix
index 0279dfc5b372..998341d6bb52 100644
--- a/pkgs/applications/editors/gnome-builder/default.nix
+++ b/pkgs/applications/editors/gnome-builder/default.nix
@@ -34,7 +34,7 @@
, webkitgtk
, wrapGAppsHook
, dbus
-, xvfb_run
+, xvfb-run
}:
stdenv.mkDerivation rec {
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
checkInputs = [
dbus
- xvfb_run
+ xvfb-run
];
outputs = [ "out" "devdoc" ];
diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix
index 616a0b713566..67f624ce9c99 100644
--- a/pkgs/applications/graphics/gscan2pdf/default.nix
+++ b/pkgs/applications/graphics/gscan2pdf/default.nix
@@ -4,7 +4,7 @@
# runtime dependencies
imagemagick, libtiff, djvulibre, poppler_utils, ghostscript, unpaper, pdftk,
# test dependencies
- xvfb_run, liberation_ttf, file, tesseract }:
+ xvfb-run, liberation_ttf, file, tesseract }:
with lib;
@@ -94,7 +94,7 @@ perlPackages.buildPerlPackage rec {
unpaper
pdftk
- xvfb_run
+ xvfb-run
file
tesseract # tests are expecting tesseract 3.x precisely
] ++ (with perlPackages; [
diff --git a/pkgs/applications/graphics/vimiv/default.nix b/pkgs/applications/graphics/vimiv/default.nix
index 6f6245a1c80d..a6320f774fd5 100644
--- a/pkgs/applications/graphics/vimiv/default.nix
+++ b/pkgs/applications/graphics/vimiv/default.nix
@@ -2,7 +2,7 @@
, gnome
# Test requirements
-, dbus, xvfb_run, xdotool
+, dbus, xvfb-run, xdotool
}:
python3Packages.buildPythonApplication rec {
@@ -37,7 +37,7 @@ python3Packages.buildPythonApplication rec {
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 ];
propagatedBuildInputs = with python3Packages; [ pillow pygobject3 gtk3 ];
diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix
index f8ebd8aed7ec..cc13ad59332b 100644
--- a/pkgs/applications/misc/girara/default.nix
+++ b/pkgs/applications/misc/girara/default.nix
@@ -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 {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
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 ];
propagatedBuildInputs = [ glib gtk ];
diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix
index 00be8103683e..05cc834591f5 100644
--- a/pkgs/applications/misc/pytrainer/default.nix
+++ b/pkgs/applications/misc/pytrainer/default.nix
@@ -13,7 +13,7 @@
, tzdata
, webkitgtk
, wrapGAppsHook
-, xvfb_run
+, xvfb-run
}:
let
@@ -66,7 +66,7 @@ in python.pkgs.buildPythonApplication rec {
checkInputs = [
glibcLocales
perl
- xvfb_run
+ xvfb-run
] ++ (with python.pkgs; [
mysqlclient
psycopg2
diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix
index d95ce9cda48b..ebfaaa1db51d 100644
--- a/pkgs/applications/misc/ulauncher/default.nix
+++ b/pkgs/applications/misc/ulauncher/default.nix
@@ -14,7 +14,7 @@
, libappindicator
, intltool
, wmctrl
-, xvfb_run
+, xvfb-run
, librsvg
}:
@@ -66,7 +66,7 @@ python3Packages.buildPythonApplication rec {
mock
pytest
pytest-mock
- xvfb_run
+ xvfb-run
];
patches = [
diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix
index d17dd059c810..52e1bc50601a 100644
--- a/pkgs/applications/networking/calls/default.nix
+++ b/pkgs/applications/networking/calls/default.nix
@@ -21,7 +21,7 @@
, dbus
, vala
, wrapGAppsHook
-, xvfb_run
+, xvfb-run
, gtk-doc
, docbook-xsl-nons
, docbook_xml_dtd_43
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
checkInputs = [
dbus
- xvfb_run
+ xvfb-run
];
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix
index bcff9e4f8b74..9e76a73233cf 100644
--- a/pkgs/applications/networking/flent/default.nix
+++ b/pkgs/applications/networking/flent/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonApplication, fetchPypi, matplotlib, procps, pyqt5, python
-, pythonPackages, qt5, sphinx, xvfb_run }:
+, pythonPackages, qt5, sphinx, xvfb-run }:
buildPythonApplication rec {
pname = "flent";
@@ -12,7 +12,7 @@ buildPythonApplication rec {
buildInputs = [ sphinx ];
nativeBuildInputs = [ qt5.wrapQtAppsHook ];
propagatedBuildInputs = [ matplotlib procps pyqt5 ];
- checkInputs = [ procps pythonPackages.mock pyqt5 xvfb_run ];
+ checkInputs = [ procps pythonPackages.mock pyqt5 xvfb-run ];
checkPhase = ''
cat >test-runner <<EOF
diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index ee9c902543ca..74a4ab968c9c 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -5,7 +5,7 @@
, glib-networking
# Test dependencies
-, xvfb_run, dbus
+, xvfb-run, dbus
# Optional dependencies
, 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 ]
++ extraPythonPackages python3.pkgs;
- checkInputs = [ xvfb_run dbus.daemon ];
+ checkInputs = [ xvfb-run dbus.daemon ];
checkPhase = ''
# https://dev.gajim.org/gajim/gajim/-/issues/10478
diff --git a/pkgs/applications/office/gtg/default.nix b/pkgs/applications/office/gtg/default.nix
index 3b7052dff7f3..4b9237d23ce7 100644
--- a/pkgs/applications/office/gtg/default.nix
+++ b/pkgs/applications/office/gtg/default.nix
@@ -11,7 +11,7 @@
, pango
, gdk-pixbuf
, gobject-introspection
-, xvfb_run
+, xvfb-run
}:
python3Packages.buildPythonApplication rec {
@@ -53,7 +53,7 @@ python3Packages.buildPythonApplication rec {
checkInputs = with python3Packages; [
nose
mock
- xvfb_run
+ xvfb-run
];
preBuild = ''
diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix
index 1d8a214c8183..95da79cca4f2 100644
--- a/pkgs/applications/office/kmymoney/default.nix
+++ b/pkgs/applications/office/kmymoney/default.nix
@@ -8,7 +8,7 @@
, sqlcipher
# Needed for running tests:
-, qtbase, xvfb_run
+, qtbase, xvfb-run
, python2, python3Packages
}:
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
'';
doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform;
- installCheckInputs = [ xvfb_run ];
+ installCheckInputs = [ xvfb-run ];
installCheckPhase =
lib.optionalString doInstallCheck ''
xvfb-run -s '-screen 0 1024x768x24' make test \
diff --git a/pkgs/applications/office/paperwork/paperwork-gtk.nix b/pkgs/applications/office/paperwork/paperwork-gtk.nix
index d37db7cddb27..3bf9f1af9a52 100644
--- a/pkgs/applications/office/paperwork/paperwork-gtk.nix
+++ b/pkgs/applications/office/paperwork/paperwork-gtk.nix
@@ -4,7 +4,7 @@
, cairo
, gnome
, librsvg
-, xvfb_run
+, xvfb-run
, dbus
, libnotify
, wrapGAppsHook
@@ -53,7 +53,7 @@ python3Packages.buildPythonApplication rec {
done
'';
- checkInputs = [ xvfb_run dbus.daemon ];
+ checkInputs = [ xvfb-run dbus.daemon ];
nativeBuildInputs = [
wrapGAppsHook
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index 305c1d728f34..70c6b9942db9 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -1,7 +1,7 @@
{ fetchurl, lib, stdenv, pkg-config, makeWrapper, meson, ninja, installShellFiles, libxcb, xcbutilkeysyms
, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev
, yajl, xcb-util-cursor, perl, pango, perlPackages, libxkbcommon
-, xorgserver, xvfb_run }:
+, xorgserver, xvfb-run }:
stdenv.mkDerivation rec {
pname = "i3";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango
perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun
perlPackages.ExtUtilsPkgConfig perlPackages.InlineC
- xorgserver xvfb_run
+ xorgserver xvfb-run
];
configureFlags = [ "--disable-builddir" ];
diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix
index 8be84abbdfb9..64677c8505f5 100644
--- a/pkgs/applications/window-managers/phosh/default.nix
+++ b/pkgs/applications/window-managers/phosh/default.nix
@@ -18,7 +18,7 @@
, upower
, wayland
, dbus
-, xvfb_run
+, xvfb-run
, phoc
, feedbackd
, networkmanager
@@ -98,7 +98,7 @@ in stdenv.mkDerivation rec {
checkInputs = [
dbus
- xvfb_run
+ xvfb-run
];
# Temporarily disabled - Test is broken (SIGABRT)
diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/desktops/cinnamon/cjs/default.nix
index 1a1e8132bd63..2e1c739c0f07 100644
--- a/pkgs/desktops/cinnamon/cjs/default.nix
+++ b/pkgs/desktops/cinnamon/cjs/default.nix
@@ -20,7 +20,7 @@
, meson
, sysprof
, dbus
-, xvfb_run
+, xvfb-run
, ninja
, makeWrapper
, which
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
];
checkInputs = [
- xvfb_run
+ xvfb-run
];
propagatedBuildInputs = [
diff --git a/pkgs/desktops/gnome/core/totem/default.nix b/pkgs/desktops/gnome/core/totem/default.nix
index f7541fe12edf..45b99680a120 100644
--- a/pkgs/desktops/gnome/core/totem/default.nix
+++ b/pkgs/desktops/gnome/core/totem/default.nix
@@ -25,7 +25,7 @@
, gnome-desktop
, gsettings-desktop-schemas
, gdk-pixbuf
-, xvfb_run
+, xvfb-run
}:
stdenv.mkDerivation rec {
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
];
checkInputs = [
- xvfb_run
+ xvfb-run
];
mesonFlags = [
diff --git a/pkgs/desktops/gnome/misc/geary/default.nix b/pkgs/desktops/gnome/misc/geary/default.nix
index a40cd30eb8da..37eca7ccc729 100644
--- a/pkgs/desktops/gnome/misc/geary/default.nix
+++ b/pkgs/desktops/gnome/misc/geary/default.nix
@@ -29,7 +29,7 @@
, python3
, gnutls
, cacert
-, xvfb_run
+, xvfb-run
, glibcLocales
, dbus
, shared-mime-info
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
dbus
gnutls # for certtool
cacert # trust store for glib-networking
- xvfb_run
+ xvfb-run
glibcLocales # required by Geary.ImapDb.DatabaseTest/utf8_case_insensitive_collation
];
diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix
index efea7ef624e9..5743a18c0fd0 100644
--- a/pkgs/development/libraries/amtk/default.nix
+++ b/pkgs/development/libraries/amtk/default.nix
@@ -7,7 +7,7 @@
, gobject-introspection
, gnome
, dbus
-, xvfb_run
+, xvfb-run
}:
stdenv.mkDerivation rec {
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
doCheck = stdenv.isLinux;
checkPhase = ''
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 \
meson test --print-errorlogs
'';
diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix
index d6920086034a..342d498f1547 100644
--- a/pkgs/development/libraries/gjs/default.nix
+++ b/pkgs/development/libraries/gjs/default.nix
@@ -19,7 +19,7 @@
, harfbuzz
, makeWrapper
, which
-, xvfb_run
+, xvfb-run
, nixosTests
}:
@@ -65,7 +65,7 @@ in stdenv.mkDerivation rec {
];
checkInputs = [
- xvfb_run
+ xvfb-run
] ++ testDeps;
propagatedBuildInputs = [
diff --git a/pkgs/development/libraries/gtkmm/4.x.nix b/pkgs/development/libraries/gtkmm/4.x.nix
index 04fa7e5dd2f3..50839568462f 100644
--- a/pkgs/development/libraries/gtkmm/4.x.nix
+++ b/pkgs/development/libraries/gtkmm/4.x.nix
@@ -12,7 +12,7 @@
, epoxy
, gnome
, makeFontsConf
-, xvfb_run
+, xvfb-run
}:
stdenv.mkDerivation rec {
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
];
checkInputs = [
- xvfb_run
+ xvfb-run
];
# Tests require fontconfig.
diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix
index 84a20154b13c..dce589dd6474 100644
--- a/pkgs/development/libraries/gtksourceview/3.x.nix
+++ b/pkgs/development/libraries/gtksourceview/3.x.nix
@@ -1,5 +1,5 @@
{ 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 {
pname = "gtksourceview";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config intltool perl gobject-introspection vala ];
- checkInputs = [ xvfb_run dbus ];
+ checkInputs = [ xvfb-run dbus ];
buildInputs = [ atk cairo glib pango libxml2 gettext ];
diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix
index 21dc5c3a884d..eb92586ce84a 100644
--- a/pkgs/development/libraries/gtksourceview/4.x.nix
+++ b/pkgs/development/libraries/gtksourceview/4.x.nix
@@ -18,7 +18,7 @@
, gnome
, gobject-introspection
, dbus
-, xvfb_run
+, xvfb-run
, shared-mime-info
}:
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
];
checkInputs = [
- xvfb_run
+ xvfb-run
dbus
];
diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix
index 6825b34d0ac1..fd4a420012c3 100644
--- a/pkgs/development/libraries/gtksourceview/5.x.nix
+++ b/pkgs/development/libraries/gtksourceview/5.x.nix
@@ -16,7 +16,7 @@
, gnome
, gobject-introspection
, dbus
-, xvfb_run
+, xvfb-run
, shared-mime-info
}:
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
];
checkInputs = [
- xvfb_run
+ xvfb-run
dbus
];
diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix
index 486326f15f86..f3b9cad0720b 100644
--- a/pkgs/development/libraries/libadwaita/default.nix
+++ b/pkgs/development/libraries/libadwaita/default.nix
@@ -10,7 +10,7 @@
, vala
, gobject-introspection
, gtk4
-, xvfb_run
+, xvfb-run
}:
stdenv.mkDerivation rec {
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
];
checkInputs = [
- xvfb_run
+ xvfb-run
];
doCheck = true;
diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix
index 912e79d54101..d62614c56c76 100644
--- a/pkgs/development/libraries/libdazzle/default.nix
+++ b/pkgs/development/libraries/libdazzle/default.nix
@@ -1,5 +1,5 @@
{ 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 {
pname = "libdazzle";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
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 ];
mesonFlags = [
diff --git a/pkgs/development/libraries/libhandy/0.x.nix b/pkgs/development/libraries/libhandy/0.x.nix
index d836efb1aeb9..7597aee697a8 100644
--- a/pkgs/development/libraries/libhandy/0.x.nix
+++ b/pkgs/development/libraries/libhandy/0.x.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitLab, meson, ninja, pkg-config, gobject-introspection, vala
, gtk-doc, docbook_xsl, docbook_xml_dtd_43
, gtk3, gnome
-, dbus, xvfb_run, libxml2
+, dbus, xvfb-run, libxml2
, hicolor-icon-theme
}:
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
gtk-doc docbook_xsl docbook_xml_dtd_43
];
buildInputs = [ gnome.gnome-desktop gtk3 libxml2 ];
- checkInputs = [ dbus xvfb_run hicolor-icon-theme ];
+ checkInputs = [ dbus xvfb-run hicolor-icon-theme ];
mesonFlags = [
"-Dgtk_doc=true"
diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix
index 65f8ccd39ec3..891bd04ea543 100644
--- a/pkgs/development/libraries/libhandy/default.nix
+++ b/pkgs/development/libraries/libhandy/default.nix
@@ -13,7 +13,7 @@
, enableGlade ? false
, glade
, dbus
-, xvfb_run
+, xvfb-run
, libxml2
, gdk-pixbuf
, librsvg
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
checkInputs = [
dbus
- xvfb_run
+ xvfb-run
at-spi2-atk
at-spi2-core
librsvg
diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix
index 8d9011bc575d..18f00a0933c3 100644
--- a/pkgs/development/libraries/libsecret/default.nix
+++ b/pkgs/development/libraries/libsecret/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, fetchpatch, glib, pkg-config, gettext, libxslt, python3
, 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 {
pname = "libsecret";
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
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
diff --git a/pkgs/development/python-modules/dogtail/default.nix b/pkgs/development/python-modules/dogtail/default.nix
index 4981440c7ccd..808c2916ddd9 100644
--- a/pkgs/development/python-modules/dogtail/default.nix
+++ b/pkgs/development/python-modules/dogtail/default.nix
@@ -10,7 +10,7 @@
, gsettings-desktop-schemas
, fetchurl
, dbus
-, xvfb_run
+, xvfb-run
, wrapGAppsHook
# , fetchPypi
}:
@@ -33,7 +33,7 @@ buildPythonPackage {
./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 ];
strictDeps = false; # issue 56943
diff --git a/pkgs/development/python-modules/liblarch/default.nix b/pkgs/development/python-modules/liblarch/default.nix
index 5ff8d25d54b5..957d37f2176a 100644
--- a/pkgs/development/python-modules/liblarch/default.nix
+++ b/pkgs/development/python-modules/liblarch/default.nix
@@ -3,7 +3,7 @@
, buildPythonPackage
, python
, pygobject3
-, xvfb_run
+, xvfb-run
, gobject-introspection
, gtk3
, pythonOlder
@@ -32,7 +32,7 @@ buildPythonPackage rec {
checkPhase = ''
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
runHook postCheck
'';
diff --git a/pkgs/development/python-modules/pystray/default.nix b/pkgs/development/python-modules/pystray/default.nix
index 9b778f9e216c..45bc2a55e599 100644
--- a/pkgs/development/python-modules/pystray/default.nix
+++ b/pkgs/development/python-modules/pystray/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchFromGitHub
-, pillow, xlib, six, xvfb_run, sphinx }:
+, pillow, xlib, six, xvfb-run, sphinx }:
buildPythonPackage rec {
pname = "pystray";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
nativeBuildInputs = [ sphinx ];
propagatedBuildInputs = [ pillow xlib six ];
- checkInputs = [ xvfb_run ];
+ checkInputs = [ xvfb-run ];
checkPhase = ''
rm tests/icon_tests.py # test needs user input
diff --git a/pkgs/development/python-modules/pywebview/default.nix b/pkgs/development/python-modules/pywebview/default.nix
index a020517dcce2..e750f234faf5 100644
--- a/pkgs/development/python-modules/pywebview/default.nix
+++ b/pkgs/development/python-modules/pywebview/default.nix
@@ -6,7 +6,7 @@
, pytest
, pythonOlder
, qt5
-, xvfb_run
+, xvfb-run
}:
buildPythonPackage rec {
@@ -31,7 +31,7 @@ buildPythonPackage rec {
checkInputs = [
pytest
- xvfb_run
+ xvfb-run
];
checkPhase = ''
diff --git a/pkgs/development/python-modules/xdot/default.nix b/pkgs/development/python-modules/xdot/default.nix
index 7dbbd89e781b..e28deaf07d64 100644
--- a/pkgs/development/python-modules/xdot/default.nix
+++ b/pkgs/development/python-modules/xdot/default.nix
@@ -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 }:
buildPythonPackage rec {
@@ -13,7 +13,7 @@ buildPythonPackage rec {
disabled = !isPy3k;
nativeBuildInputs = [ wrapGAppsHook ];
propagatedBuildInputs = [ gobject-introspection pygobject3 graphviz gtk3 numpy ];
- checkInputs = [ xvfb_run ];
+ checkInputs = [ xvfb-run ];
checkPhase = ''
xvfb-run -s '-screen 0 800x600x24' ${python3.interpreter} nix_run_setup test
diff --git a/pkgs/development/r-modules/generic-builder.nix b/pkgs/development/r-modules/generic-builder.nix
index 1e96a64a5e28..a10c3628ff83 100644
--- a/pkgs/development/r-modules/generic-builder.nix
+++ b/pkgs/development/r-modules/generic-builder.nix
@@ -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:
stdenv.mkDerivation ({
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];
NIX_CFLAGS_COMPILE =
@@ -29,7 +29,7 @@ stdenv.mkDerivation ({
rCommand = if requireX then
# Unfortunately, xvfb-run has a race condition even with -a option, so that
# 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
"R";
diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix
index 05750b962f00..aad76062e364 100644
--- a/pkgs/tools/misc/xvfb-run/default.nix
+++ b/pkgs/tools/misc/xvfb-run/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, makeWrapper, xorgserver, getopt
, xauth, util-linux, which, fontsConf, gawk, coreutils }:
let
- xvfb_run = fetchurl {
+ xvfb-run = fetchurl {
name = "xvfb-run";
# 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";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ makeWrapper ];
buildCommand = ''
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
patchShebangs $out/bin/xvfb-run
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 45bcc9283526..10a6de27deb1 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9248,7 +9248,7 @@ let
propagatedBuildInputs = [ Readonly Gtk3 ];
checkInputs = [ TestDifferences PerlMagick TryTiny TestMockObject CarpAlways pkgs.librsvg ];
checkPhase = ''
- ${pkgs.xvfb_run}/bin/xvfb-run -s '-screen 0 800x600x24' \
+ ${pkgs.xvfb-run}/bin/xvfb-run -s '-screen 0 800x600x24' \
make test
'';
meta = {