Merge master into staging-next

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 = [

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 = [

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
   ];