diff options
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/amtk/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/gjs/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/gtkmm/4.x.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/gtksourceview/3.x.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/gtksourceview/4.x.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/gtksourceview/5.x.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/libadwaita/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/libdazzle/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/libhandy/0.x.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/libhandy/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/libsecret/default.nix | 4 |
11 files changed, 22 insertions, 22 deletions
diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix index efea7ef624e90..5743a18c0fd0c 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 d6920086034a3..342d498f1547f 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 04fa7e5dd2f3b..50839568462fc 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 84a20154b13c2..dce589dd6474f 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 21dc5c3a884d6..eb92586ce84a2 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 6825b34d0ac1c..fd4a420012c32 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 486326f15f868..f3b9cad0720b2 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 912e79d541018..d62614c56c765 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 d836efb1aeb9e..7597aee697a8b 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 65f8ccd39ec3e..891bd04ea5439 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 8d9011bc575d8..18f00a0933c35 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 |