treewide: xvfb_run -> xvfb-run
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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" ];
|
||||
|
||||
@@ -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" ];
|
||||
|
||||
@@ -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; [
|
||||
|
||||
@@ -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 ];
|
||||
|
||||
|
||||
@@ -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 ];
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 = [
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 = ''
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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" ];
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user