Merge commit '3a8d7958a610cd3fec3a6f424480f91a1b259185'

28 files changed, 134 insertions, 54 deletions

diff --git a/nixpkgs/pkgs/desktops/cinnamon/bulky/default.nix b/nixpkgs/pkgs/desktops/cinnamon/bulky/default.nix
index aadb1a989f4a..7797586f5abd 100644
--- a/nixpkgs/pkgs/desktops/cinnamon/bulky/default.nix
+++ b/nixpkgs/pkgs/desktops/cinnamon/bulky/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "bulky";
-  version = "1.3";
+  version = "1.4";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "bulky";
     rev = version;
-    sha256 = "sha256-jBGrfE8jYQStIs9h/b/1yBu8OEQdPOMHZ/U/KczfX+4=";
+    sha256 = "sha256-i6OmkZGgZpfp8G2T6CDFQmIG/0V36YFbWBR7MvDi6Ew=";
   };
 
   nativeBuildInputs = [
diff --git a/nixpkgs/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix b/nixpkgs/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix
index 86d92adbea80..a350c224e8a6 100644
--- a/nixpkgs/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, gnome_python, librsvg, libwnck, libgtop, pkg-config, python2, gtk2 }:
+{ lib, stdenv, fetchurl, gnome_python, librsvg, libwnck2, libgtop, pkg-config, python2, gtk2 }:
 
 let
   inherit (python2.pkgs) python pygtk;
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ gtk2 librsvg libwnck libgtop python ];
+  buildInputs = [ gtk2 librsvg libwnck2 libgtop python ];
   propagatedBuildInputs = [ gnome_python pygtk ];
 
   # gnome-python-desktop expects that .pth file is already installed by PyGTK
diff --git a/nixpkgs/pkgs/desktops/gnome-2/default.nix b/nixpkgs/pkgs/desktops/gnome-2/default.nix
index 50222b386c8e..722168632062 100644
--- a/nixpkgs/pkgs/desktops/gnome-2/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome-2/default.nix
@@ -74,7 +74,7 @@ lib.makeScope pkgs.newScope (self: with self; {
     glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 libcanberra-gtk2
 
     # Included for backwards compatibility
-    libsoup libwnck gtk-doc gnome-doc-utils rarian
+    libsoup libwnck2 gtk-doc gnome-doc-utils rarian
 
     gvfs # added 2019-09-03
   ;
diff --git a/nixpkgs/pkgs/desktops/gnome/apps/accerciser/default.nix b/nixpkgs/pkgs/desktops/gnome/apps/accerciser/default.nix
index d81b84661941..9c099f65295b 100644
--- a/nixpkgs/pkgs/desktops/gnome/apps/accerciser/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome/apps/accerciser/default.nix
@@ -11,7 +11,7 @@
 , at-spi2-core
 , dbus
 , gettext
-, libwnck3
+, libwnck
 , adwaita-icon-theme
 }:
 
@@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication rec {
     adwaita-icon-theme
     at-spi2-core
     gtk3
-    libwnck3
+    libwnck
   ];
 
   propagatedBuildInputs = with python3.pkgs; [
diff --git a/nixpkgs/pkgs/desktops/gnome/extensions/gsconnect/default.nix b/nixpkgs/pkgs/desktops/gnome/extensions/gsconnect/default.nix
index 8906ebcddeca..a777da990d83 100644
--- a/nixpkgs/pkgs/desktops/gnome/extensions/gsconnect/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome/extensions/gsconnect/default.nix
@@ -110,7 +110,7 @@ stdenv.mkDerivation rec {
     description = "KDE Connect implementation for Gnome Shell";
     homepage = "https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ etu ];
+    maintainers = teams.gnome.members;
     platforms = platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/desktops/gnome/games/atomix/default.nix b/nixpkgs/pkgs/desktops/gnome/games/atomix/default.nix
index 43d9aaa7680c..e57191f0a1dd 100644
--- a/nixpkgs/pkgs/desktops/gnome/games/atomix/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome/games/atomix/default.nix
@@ -1,14 +1,12 @@
 { lib, stdenv, fetchurl, meson, ninja, pkg-config, wrapGAppsHook, python3
 , gettext, gnome, glib, gtk3, libgnome-games-support, gdk-pixbuf }:
 
-let
+stdenv.mkDerivation rec {
   pname = "atomix";
   version = "3.34.0";
-in stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/atomix/${lib.versions.majorMinor version}/atomix-${version}.tar.xz";
     sha256 = "0h909a4mccf160hi0aimyicqhq2b0gk1dmqp7qwf87qghfrw6m00";
   };
 
diff --git a/nixpkgs/pkgs/desktops/gnome/games/gnome-klotski/default.nix b/nixpkgs/pkgs/desktops/gnome/games/gnome-klotski/default.nix
index bb4cdae8fa35..e21cceb08509 100644
--- a/nixpkgs/pkgs/desktops/gnome/games/gnome-klotski/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome/games/gnome-klotski/default.nix
@@ -3,14 +3,12 @@
 , meson, ninja, python3
 }:
 
-let
+stdenv.mkDerivation rec {
   pname = "gnome-klotski";
   version = "3.38.2";
-in stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-klotski/${lib.versions.majorMinor version}/gnome-klotski-${version}.tar.xz";
     sha256 = "1qm01hdd5yp8chig62bj10912vclbdvywwczs84sfg4zci2phqwi";
   };
 
diff --git a/nixpkgs/pkgs/desktops/gnome/misc/gnome-applets/default.nix b/nixpkgs/pkgs/desktops/gnome/misc/gnome-applets/default.nix
index d414266a9d9e..f581017dd565 100644
--- a/nixpkgs/pkgs/desktops/gnome/misc/gnome-applets/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome/misc/gnome-applets/default.nix
@@ -7,7 +7,7 @@
 , gnome-panel
 , gtk3
 , glib
-, libwnck3
+, libwnck
 , libgtop
 , libnotify
 , upower
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     gtk3
     glib
     libxml2
-    libwnck3
+    libwnck
     libgtop
     libnotify
     upower
diff --git a/nixpkgs/pkgs/desktops/gnome/misc/gnome-panel/default.nix b/nixpkgs/pkgs/desktops/gnome/misc/gnome-panel/default.nix
index 8ab1a87d01ce..2e33be766b86 100644
--- a/nixpkgs/pkgs/desktops/gnome/misc/gnome-panel/default.nix
+++ b/nixpkgs/pkgs/desktops/gnome/misc/gnome-panel/default.nix
@@ -13,7 +13,7 @@
 , itstool
 , libgweather
 , libsoup
-, libwnck3
+, libwnck
 , libxml2
 , pkg-config
 , polkit
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
     gtk3
     libgweather
     libsoup
-    libwnck3
+    libwnck
     polkit
     systemd
   ];
diff --git a/nixpkgs/pkgs/desktops/lxde/core/lxpanel/default.nix b/nixpkgs/pkgs/desktops/lxde/core/lxpanel/default.nix
index 548f89389599..1208f9cd64cf 100644
--- a/nixpkgs/pkgs/desktops/lxde/core/lxpanel/default.nix
+++ b/nixpkgs/pkgs/desktops/lxde/core/lxpanel/default.nix
@@ -10,7 +10,7 @@
 , gtk2
 , libX11
 , libfm
-, libwnck
+, libwnck2
 , libXmu
 , libXpm
 , cairo
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     gtk2
     libX11
     libfm
-    libwnck
+    libwnck2
     libXmu
     libXpm
     cairo
diff --git a/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix b/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix
index ccd20a6b875a..3a34d7af7157 100644
--- a/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gnome, glib, gtk3, gtksourceview3, libwnck3
+{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gnome, glib, gtk3, gtksourceview3, libwnck
 , libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook
 , mateUpdateScript }:
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     gtk3
     gtksourceview3
     gnome.gucharmap
-    libwnck3
+    libwnck
     libgtop
     libxml2
     libnotify
diff --git a/nixpkgs/pkgs/desktops/mate/mate-netbook/default.nix b/nixpkgs/pkgs/desktops/mate/mate-netbook/default.nix
index 9b7a5ae67180..de452f456a2c 100644
--- a/nixpkgs/pkgs/desktops/mate/mate-netbook/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/mate-netbook/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook, mateUpdateScript }:
+{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libwnck, libfakekey, libXtst, mate, wrapGAppsHook, mateUpdateScript }:
 
 stdenv.mkDerivation rec {
   pname = "mate-netbook";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gtk3
-    libwnck3
+    libwnck
     libfakekey
     libXtst
     mate.mate-panel
diff --git a/nixpkgs/pkgs/desktops/mate/mate-notification-daemon/default.nix b/nixpkgs/pkgs/desktops/mate/mate-notification-daemon/default.nix
index 62181418fdfe..ac5e5376a8e7 100644
--- a/nixpkgs/pkgs/desktops/mate/mate-notification-daemon/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/mate-notification-daemon/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, pkg-config, gettext, glib, libcanberra-gtk3,
-  libnotify, libwnck3, gtk3, libxml2, wrapGAppsHook, mateUpdateScript }:
+  libnotify, libwnck, gtk3, libxml2, wrapGAppsHook, mateUpdateScript }:
 
 stdenv.mkDerivation rec {
   pname = "mate-notification-daemon";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libcanberra-gtk3
     libnotify
-    libwnck3
+    libwnck
     gtk3
   ];
 
diff --git a/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix b/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix
index 328fcfd20dee..cd73408d4c80 100644
--- a/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, libwnck3, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook, mateUpdateScript }:
+{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, libwnck, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook, mateUpdateScript }:
 
 stdenv.mkDerivation rec {
   pname = "mate-panel";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     glib
-    libwnck3
+    libwnck
     librsvg
     libxml2
     gtk3
diff --git a/nixpkgs/pkgs/desktops/mate/mate-system-monitor/default.nix b/nixpkgs/pkgs/desktops/mate/mate-system-monitor/default.nix
index 4527c91eed6b..fed7dc12629c 100644
--- a/nixpkgs/pkgs/desktops/mate/mate-system-monitor/default.nix
+++ b/nixpkgs/pkgs/desktops/mate/mate-system-monitor/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, polkit, systemd, wrapGAppsHook, mateUpdateScript }:
+{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtkmm3, libxml2, libgtop, libwnck, librsvg, polkit, systemd, wrapGAppsHook, mateUpdateScript }:
 
 stdenv.mkDerivation rec {
   pname = "mate-system-monitor";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     gtkmm3
     libxml2
     libgtop
-    libwnck3
+    libwnck
     librsvg
     polkit
     systemd
diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-dock/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-dock/default.nix
index db6633aa5bdb..797f62cf8e2f 100644
--- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-dock/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-dock/default.nix
@@ -7,7 +7,7 @@
 , dconf
 , glib
 , gtk3
-, libwnck3
+, libwnck
 , libX11
 , libXfixes
 , libXi
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
     libXi
     libdbusmenu-gtk3
     libgee
-    libwnck3
+    libwnck
     pango
   ];
 
diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-mail/default.nix
new file mode 100644
index 000000000000..b909f2472ad0
--- /dev/null
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-mail/default.nix
@@ -0,0 +1,82 @@
+{ lib, stdenv
+, fetchFromGitHub
+, nix-update-script
+, pantheon
+, pkg-config
+, meson
+, ninja
+, python3
+, vala
+, desktop-file-utils
+, gtk3
+, libxml2
+, libhandy
+, webkitgtk
+, folks
+, libgdata
+, sqlite
+, granite
+, elementary-icon-theme
+, evolution-data-server
+, appstream
+, wrapGAppsHook
+, libgee
+}:
+
+stdenv.mkDerivation rec {
+  pname = "elementary-mail";
+  version = "unstable-2021-06-21";
+
+  repoName = "mail";
+
+  src = fetchFromGitHub {
+    owner = "elementary";
+    repo = repoName;
+    rev = "c64c87fabb31dea8dc388152d5a835401993acf4";
+    sha256 = "yEUg1IbYbzOJiklnqR23X+aGVE9j4F9iH8FkmlB15x4=";
+  };
+
+  passthru = {
+    updateScript = nix-update-script {
+      attrPath = "pantheon.${pname}";
+    };
+  };
+
+  nativeBuildInputs = [
+    appstream
+    desktop-file-utils
+    libxml2
+    meson
+    ninja
+    pkg-config
+    python3
+    vala
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    elementary-icon-theme
+    evolution-data-server
+    folks
+    granite
+    gtk3
+    libgdata
+    libgee
+    libhandy
+    sqlite
+    webkitgtk
+  ];
+
+  postPatch = ''
+    chmod +x meson/post_install.py
+    patchShebangs meson/post_install.py
+  '';
+
+  meta = with lib; {
+    description = "Mail app designed for elementary OS";
+    homepage = "https://github.com/elementary/mail";
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = pantheon.maintainers ++ [ maintainers.ethancedwards8 ];
+  };
+}
diff --git a/nixpkgs/pkgs/desktops/pantheon/default.nix b/nixpkgs/pkgs/desktops/pantheon/default.nix
index 82d6a87b1090..5ff368a642ed 100644
--- a/nixpkgs/pkgs/desktops/pantheon/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/default.nix
@@ -49,6 +49,8 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   elementary-feedback = callPackage ./apps/elementary-feedback { };
 
+  elementary-mail = callPackage ./apps/elementary-mail { };
+
   elementary-music = callPackage ./apps/elementary-music { };
 
   elementary-photos = callPackage ./apps/elementary-photos { };
diff --git a/nixpkgs/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix
index 0c277f3a8439..6c7e0b296819 100644
--- a/nixpkgs/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix
@@ -1,4 +1,4 @@
-{ mkXfceDerivation, exo, gtk3, libwnck3, libXmu }:
+{ mkXfceDerivation, exo, gtk3, libwnck, libXmu }:
 
 mkXfceDerivation {
   category = "apps";
@@ -8,7 +8,7 @@ mkXfceDerivation {
   sha256 = "sha256-jcICXPtG/7t0U0xqgvU52mjiA8wsyw7JQ0OmNjwA89A=";
 
   nativeBuildInputs = [ exo ];
-  buildInputs = [ gtk3 libwnck3 libXmu ];
+  buildInputs = [ gtk3 libwnck libXmu ];
 
   meta = {
     description = "Easy to use task manager for Xfce";
diff --git a/nixpkgs/pkgs/desktops/xfce/applications/xfdashboard/default.nix b/nixpkgs/pkgs/desktops/xfce/applications/xfdashboard/default.nix
index 80e3b7ed791a..493a70a75ed0 100644
--- a/nixpkgs/pkgs/desktops/xfce/applications/xfdashboard/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/applications/xfdashboard/default.nix
@@ -4,7 +4,7 @@
 , libXinerama
 , libXdamage
 , libX11
-, libwnck3
+, libwnck
 , libxfce4ui
 , libxfce4util
 , garcon
@@ -33,7 +33,7 @@ mkXfceDerivation {
     libXcomposite
     libXdamage
     libXinerama
-    libwnck3
+    libwnck
     libxfce4ui
     libxfce4util
     xfconf
diff --git a/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel/default.nix
index 86c1789a1b0e..417241235b95 100644
--- a/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel/default.nix
@@ -5,7 +5,7 @@
 , gobject-introspection
 , gtk3
 , libdbusmenu-gtk3
-, libwnck3
+, libwnck
 , libxfce4ui
 , libxfce4util
 , tzdata
@@ -30,7 +30,7 @@ mkXfceDerivation {
     garcon
     libdbusmenu-gtk3
     libxfce4ui
-    libwnck3
+    libwnck
     xfconf
     tzdata
   ];
diff --git a/nixpkgs/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix b/nixpkgs/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix
index 76672b660a17..9877027c4033 100644
--- a/nixpkgs/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix
@@ -1,5 +1,5 @@
 { mkXfceDerivation, automakeAddFlags, exo, gtk3, libnotify
-, libxfce4ui, libxfce4util, upower, xfconf }:
+, libxfce4ui, libxfce4util, upower, xfconf, xfce4-panel }:
 
 mkXfceDerivation {
   category = "xfce";
@@ -9,7 +9,7 @@ mkXfceDerivation {
   sha256 = "sha256-Qk++1db+agiU99p+QW8/WNnNqFVejV/BcnmgvfoB3OU=";
 
   nativeBuildInputs = [ automakeAddFlags exo ];
-  buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util upower xfconf ];
+  buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util upower xfconf xfce4-panel ];
 
   postPatch = ''
     substituteInPlace configure.ac.in --replace gio-2.0 gio-unix-2.0
diff --git a/nixpkgs/pkgs/desktops/xfce/core/xfce4-session/default.nix b/nixpkgs/pkgs/desktops/xfce/core/xfce4-session/default.nix
index d47dbc9340a0..27eaf94b2599 100644
--- a/nixpkgs/pkgs/desktops/xfce/core/xfce4-session/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/xfce4-session/default.nix
@@ -1,4 +1,4 @@
-{ mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, iceauth, gtk3, glib, libwnck3, xfce4-session }:
+{ mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, iceauth, gtk3, glib, libwnck, xfce4-session }:
 
 mkXfceDerivation {
   category = "xfce";
@@ -7,7 +7,7 @@ mkXfceDerivation {
 
   sha256 = "sha256-LIRAQ1YAkAHwIzC5NYV/0iFLkAP5V96wuTIrYTGbGy0=";
 
-  buildInputs = [ exo gtk3 glib libxfce4ui libxfce4util libwnck3 xfconf polkit iceauth ];
+  buildInputs = [ exo gtk3 glib libxfce4ui libxfce4util libwnck xfconf polkit iceauth ];
 
   configureFlags = [ "--with-xsession-prefix=${placeholder "out"}" ];
 
diff --git a/nixpkgs/pkgs/desktops/xfce/core/xfdesktop/default.nix b/nixpkgs/pkgs/desktops/xfce/core/xfdesktop/default.nix
index d47d4769a566..bc6a19346ece 100644
--- a/nixpkgs/pkgs/desktops/xfce/core/xfdesktop/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/xfdesktop/default.nix
@@ -1,4 +1,4 @@
-{ mkXfceDerivation, exo, gtk3, libxfce4ui, libxfce4util, libwnck3, xfconf, libnotify, garcon, thunar }:
+{ mkXfceDerivation, exo, gtk3, libxfce4ui, libxfce4util, libwnck, xfconf, libnotify, garcon, thunar }:
 
 mkXfceDerivation {
   category = "xfce";
@@ -12,7 +12,7 @@ mkXfceDerivation {
     gtk3
     libxfce4ui
     libxfce4util
-    libwnck3
+    libwnck
     xfconf
     libnotify
     garcon
diff --git a/nixpkgs/pkgs/desktops/xfce/core/xfwm4/default.nix b/nixpkgs/pkgs/desktops/xfce/core/xfwm4/default.nix
index 179da89a5212..cc998487f165 100644
--- a/nixpkgs/pkgs/desktops/xfce/core/xfwm4/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/core/xfwm4/default.nix
@@ -1,5 +1,5 @@
 { mkXfceDerivation, exo, librsvg, dbus-glib, epoxy, gtk3, libXdamage
-, libstartup_notification, libxfce4ui, libxfce4util, libwnck3
+, libstartup_notification, libxfce4ui, libxfce4util, libwnck
 , libXpresent, xfconf }:
 
 mkXfceDerivation {
@@ -19,7 +19,7 @@ mkXfceDerivation {
     libstartup_notification
     libxfce4ui
     libxfce4util
-    libwnck3
+    libwnck
     libXpresent
     xfconf
   ];
diff --git a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix
index a44e923d3563..baba34212fdc 100644
--- a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, pkg-config, fetchFromGitHub, python3, vala_0_46
-, gtk3, libwnck3, libxfce4util, xfce4-panel, wafHook, xfce }:
+, gtk3, libwnck, libxfce4util, xfce4-panel, wafHook, xfce }:
 
 stdenv.mkDerivation rec {
   pname = "xfce4-namebar-plugin";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkg-config vala_0_46 wafHook python3 ];
-  buildInputs = [ gtk3 libwnck3 libxfce4util xfce4-panel ];
+  buildInputs = [ gtk3 libwnck libxfce4util xfce4-panel ];
 
   postPatch = ''
     substituteInPlace src/namebar.vala --replace 'var dirs = Environment.get_system_data_dirs()' "string[] dirs = { \"$out/share\" }"
diff --git a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix
index bcd43d328e33..8f4751b1737b 100644
--- a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, intltool, python3, imagemagick, libwnck3, libxfce4ui, xfce4-panel, xfconf, xfce4-dev-tools, xfce }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, intltool, python3, imagemagick, libwnck, libxfce4ui, xfce4-panel, xfconf, xfce4-dev-tools, xfce }:
 
 stdenv.mkDerivation rec {
   pname  = "xfce4-windowck-plugin";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     python3
     imagemagick
-    libwnck3
+    libwnck
     libxfce4ui
     xfce4-panel
     xfconf
diff --git a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix
index f24a38c82a3a..8145f1a2af06 100644
--- a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix
@@ -2,7 +2,7 @@
 , mkXfceDerivation
 , gtk3
 , librsvg
-, libwnck3
+, libwnck
 , libxklavier
 , garcon
 , libxfce4ui
@@ -25,7 +25,7 @@ mkXfceDerivation {
     libxfce4ui
     libxfce4util
     libxklavier
-    libwnck3
+    libwnck
     xfce4-panel
     xfconf
   ];