Merge staging-next into master, closes #65497

4 files changed, 8 insertions, 8 deletions

diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix
index 72b9ce09d76d2..4139b650fb780 100644
--- a/pkgs/applications/networking/mailreaders/inboxer/default.nix
+++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, binutils, patchelf, makeWrapper
-, expat, xorg, gdk_pixbuf, glib, gnome2, cairo, atk, freetype
+, expat, xorg, gdk-pixbuf, glib, gnome2, cairo, atk, freetype
 , fontconfig, dbus, nss, nspr, gtk2-x11, alsaLib, cups, libpulseaudio, udev }:
 
 stdenv.mkDerivation rec {
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
       xorg.libXtst
       xorg.libXScrnSaver
       xorg.libxcb
-      gdk_pixbuf
+      gdk-pixbuf
       glib
       gnome2.pango
       gnome2.GConf
diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix
index 32455e1132fd9..d81513406624d 100644
--- a/pkgs/applications/networking/mailreaders/mailnag/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, gettext, gtk3, pythonPackages
-, gdk_pixbuf, libnotify, gst_all_1
+, gdk-pixbuf, libnotify, gst_all_1
 , libgnome-keyring3
 , wrapGAppsHook, gnome3
 # otherwise passwords are stored unencrypted
@@ -18,7 +18,7 @@ in pythonPackages.buildPythonApplication rec {
   };
 
   buildInputs = [
-    gtk3 gdk_pixbuf libnotify gst_all_1.gstreamer
+    gtk3 gdk-pixbuf libnotify gst_all_1.gstreamer
     gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
     gst_all_1.gst-plugins-bad
     gnome3.adwaita-icon-theme
diff --git a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix
index 3d8673a87a1b7..5bb24c9ded7e1 100644
--- a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix
@@ -10,7 +10,7 @@
 , fontconfig
 , freetype
 , gcc-unwrapped
-, gdk_pixbuf
+, gdk-pixbuf
 , glib
 , gnome2
 , libgnome-keyring
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     fontconfig
     freetype
     gcc-unwrapped
-    gdk_pixbuf
+    gdk-pixbuf
     glib
     gnome2.GConf
     gnome2.gtk
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index 0882336447910..5e005cd6669d9 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -10,7 +10,7 @@
 , dbus
 , fontconfig
 , freetype
-, gdk_pixbuf
+, gdk-pixbuf
 , glib
 , glibc
 , gst-plugins-base
@@ -90,7 +90,7 @@ stdenv.mkDerivation {
       dbus
       fontconfig
       freetype
-      gdk_pixbuf
+      gdk-pixbuf
       glib
       glibc
       gst-plugins-base