diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 50403cc319b5..896a797cefbd 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -318,13 +318,19 @@ - + The antlr package now defaults to the 4.x release instead of the old 2.7.7 version. + + + The libwnck package now defaults to the 3.x + release instead of the old 2.31.0 version. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index bff791bc85d9..afb129960411 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -80,6 +80,9 @@ In addition to numerous new and upgraded packages, this release has the followin * The `antlr` package now defaults to the 4.x release instead of the old 2.7.7 version. +* The `libwnck` package now defaults to the 3.x release instead of the + old 2.31.0 version. + ## Other Notable Changes {#sec-release-21.11-notable-changes} - The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets. diff --git a/pkgs/applications/misc/devilspie2/default.nix b/pkgs/applications/misc/devilspie2/default.nix index 2d3c28b2d715..b9d8b0f9797d 100644 --- a/pkgs/applications/misc/devilspie2/default.nix +++ b/pkgs/applications/misc/devilspie2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, pkg-config, glib, gtk, lua, libwnck3 }: +{ lib, stdenv, fetchurl, intltool, pkg-config, glib, gtk, lua, libwnck }: stdenv.mkDerivation rec { pname = "devilspie2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ intltool pkg-config ]; - buildInputs = [ glib gtk lua libwnck3 ]; + buildInputs = [ glib gtk lua libwnck ]; installPhase = '' mkdir -p $out/bin $out/share/man/man1 diff --git a/pkgs/applications/misc/dockbarx/default.nix b/pkgs/applications/misc/dockbarx/default.nix index cac6c363c323..9471751844e0 100644 --- a/pkgs/applications/misc/dockbarx/default.nix +++ b/pkgs/applications/misc/dockbarx/default.nix @@ -4,7 +4,7 @@ , gobject-introspection , gtk3 , keybinder3 -, libwnck3 +, libwnck , python3Packages , wrapGAppsHook }: @@ -31,7 +31,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ gobject-introspection gtk3 - libwnck3 + libwnck keybinder3 ]; diff --git a/pkgs/applications/misc/gxkb/default.nix b/pkgs/applications/misc/gxkb/default.nix index 7f2b93f14956..16268bc76c73 100644 --- a/pkgs/applications/misc/gxkb/default.nix +++ b/pkgs/applications/misc/gxkb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk3, libwnck3, libxklavier +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk3, libwnck, libxklavier , appindicatorSupport ? true, libayatana-appindicator-gtk3 }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ gtk3 libwnck3 libxklavier ] ++ lib.optional appindicatorSupport libayatana-appindicator-gtk3; + buildInputs = [ gtk3 libwnck libxklavier ] ++ lib.optional appindicatorSupport libayatana-appindicator-gtk3; configureFlags = lib.optional appindicatorSupport "--enable-appindicator=yes"; outputs = [ "out" "man" ]; diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix index 07ff7c17f691..47e310fb7658 100644 --- a/pkgs/applications/misc/kupfer/default.nix +++ b/pkgs/applications/misc/kupfer/default.nix @@ -5,7 +5,7 @@ , gobject-introspection , gtk3 , itstool -, libwnck3 +, libwnck , keybinder3 , desktop-file-utils , shared-mime-info @@ -34,7 +34,7 @@ buildPythonApplication rec { desktop-file-utils # for update-desktop-database shared-mime-info # for update-mime-info ]; - buildInputs = [ docutils libwnck3 keybinder3 ]; + buildInputs = [ docutils libwnck keybinder3 ]; propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ]; # without strictDeps kupfer fails to build: Could not find the python module 'gi.repository.Gtk' diff --git a/pkgs/applications/misc/notify-osd-customizable/default.nix b/pkgs/applications/misc/notify-osd-customizable/default.nix index b00ee18d5f33..820eceabb511 100644 --- a/pkgs/applications/misc/notify-osd-customizable/default.nix +++ b/pkgs/applications/misc/notify-osd-customizable/default.nix @@ -5,7 +5,7 @@ , gnome , libnotify , libtool -, libwnck3 +, libwnck , makeWrapper , pkg-config , gsettings-desktop-schemas @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - glib libwnck3 libnotify dbus-glib makeWrapper + glib libwnck libnotify dbus-glib makeWrapper gsettings-desktop-schemas gnome.gnome-common libtool ]; diff --git a/pkgs/applications/misc/notify-osd/default.nix b/pkgs/applications/misc/notify-osd/default.nix index d68601ca6ec7..005d0273466c 100644 --- a/pkgs/applications/misc/notify-osd/default.nix +++ b/pkgs/applications/misc/notify-osd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, libwnck3, libnotify, dbus-glib, makeWrapper, gsettings-desktop-schemas }: +{ lib, stdenv, fetchurl, pkg-config, glib, libwnck, libnotify, dbus-glib, makeWrapper, gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "notify-osd"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - glib libwnck3 libnotify dbus-glib makeWrapper + glib libwnck libnotify dbus-glib makeWrapper gsettings-desktop-schemas ]; diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix index 30d9533d4530..85e3bb48119c 100644 --- a/pkgs/applications/misc/plank/default.nix +++ b/pkgs/applications/misc/plank/default.nix @@ -7,7 +7,7 @@ , glib , gnome , gtk3 -, libwnck3 +, libwnck , libX11 , libXfixes , libXi @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { libXi libdbusmenu-gtk3 libgee - libwnck3 + libwnck pango ]; diff --git a/pkgs/applications/misc/xsuspender/default.nix b/pkgs/applications/misc/xsuspender/default.nix index 93e56f1df2d0..c09c9329aab3 100644 --- a/pkgs/applications/misc/xsuspender/default.nix +++ b/pkgs/applications/misc/xsuspender/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, makeWrapper, pkg-config -, glib, libwnck3, procps }: +, glib, libwnck, procps }: with lib; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "doc" ]; nativeBuildInputs = [ cmake pkg-config makeWrapper ]; - buildInputs = [ glib libwnck3 ]; + buildInputs = [ glib libwnck ]; postInstall = '' wrapProgram $out/bin/xsuspender \ diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix index 11bdeeb3bf62..588839b859da 100644 --- a/pkgs/applications/system/monitor/default.nix +++ b/pkgs/applications/system/monitor/default.nix @@ -11,7 +11,7 @@ , glib , gtk3 , bamf -, libwnck3 +, libwnck , libgee , libgtop , wrapGAppsHook @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { pantheon.wingpanel libgee libgtop - libwnck3 + libwnck ]; postPatch = '' diff --git a/pkgs/applications/terminal-emulators/guake/default.nix b/pkgs/applications/terminal-emulators/guake/default.nix index 62cb6707c1b2..8c4c6b383d56 100644 --- a/pkgs/applications/terminal-emulators/guake/default.nix +++ b/pkgs/applications/terminal-emulators/guake/default.nix @@ -9,7 +9,7 @@ , libnotify , libutempter , vte -, libwnck3 +, libwnck }: python3.pkgs.buildPythonApplication rec { @@ -41,7 +41,7 @@ python3.pkgs.buildPythonApplication rec { gtk3 keybinder3 libnotify - libwnck3 + libwnck python3 vte ]; diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix index 35b7d173257f..f99b4930870e 100644 --- a/pkgs/applications/video/kazam/default.nix +++ b/pkgs/applications/video/kazam/default.nix @@ -1,5 +1,5 @@ { lib, fetchurl, substituteAll, python3, gst_all_1, wrapGAppsHook, gobject-introspection -, gtk3, libwnck3, keybinder3, intltool, libcanberra-gtk3, libappindicator-gtk3, libpulseaudio +, gtk3, libwnck, keybinder3, intltool, libcanberra-gtk3, libappindicator-gtk3, libpulseaudio , fetchpatch }: python3.pkgs.buildPythonApplication rec { @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection python3.pkgs.distutils_extra intltool wrapGAppsHook ]; buildInputs = [ - gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gtk3 libwnck3 + gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gtk3 libwnck keybinder3 libappindicator-gtk3 ]; diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix index 86d92adbea80..a350c224e8a6 100644 --- a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix +++ b/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/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 50222b386c8e..722168632062 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/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/pkgs/desktops/gnome/apps/accerciser/default.nix b/pkgs/desktops/gnome/apps/accerciser/default.nix index d81b84661941..9c099f65295b 100644 --- a/pkgs/desktops/gnome/apps/accerciser/default.nix +++ b/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/pkgs/desktops/gnome/misc/gnome-applets/default.nix b/pkgs/desktops/gnome/misc/gnome-applets/default.nix index d414266a9d9e..f581017dd565 100644 --- a/pkgs/desktops/gnome/misc/gnome-applets/default.nix +++ b/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/pkgs/desktops/gnome/misc/gnome-panel/default.nix b/pkgs/desktops/gnome/misc/gnome-panel/default.nix index 8ab1a87d01ce..2e33be766b86 100644 --- a/pkgs/desktops/gnome/misc/gnome-panel/default.nix +++ b/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/pkgs/desktops/lxde/core/lxpanel/default.nix b/pkgs/desktops/lxde/core/lxpanel/default.nix index 548f89389599..1208f9cd64cf 100644 --- a/pkgs/desktops/lxde/core/lxpanel/default.nix +++ b/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/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index ccd20a6b875a..3a34d7af7157 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/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/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix index 9b7a5ae67180..de452f456a2c 100644 --- a/pkgs/desktops/mate/mate-netbook/default.nix +++ b/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/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index 62181418fdfe..ac5e5376a8e7 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/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/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index 328fcfd20dee..cd73408d4c80 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/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/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix index 4527c91eed6b..fed7dc12629c 100644 --- a/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/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/pkgs/desktops/pantheon/apps/elementary-dock/default.nix b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix index db6633aa5bdb..797f62cf8e2f 100644 --- a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix +++ b/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/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix b/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix index 0c277f3a8439..6c7e0b296819 100644 --- a/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix +++ b/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/pkgs/desktops/xfce/applications/xfdashboard/default.nix b/pkgs/desktops/xfce/applications/xfdashboard/default.nix index 80e3b7ed791a..493a70a75ed0 100644 --- a/pkgs/desktops/xfce/applications/xfdashboard/default.nix +++ b/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/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/pkgs/desktops/xfce/core/xfce4-panel/default.nix index 86c1789a1b0e..417241235b95 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel/default.nix +++ b/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/pkgs/desktops/xfce/core/xfce4-session/default.nix b/pkgs/desktops/xfce/core/xfce4-session/default.nix index d47dbc9340a0..27eaf94b2599 100644 --- a/pkgs/desktops/xfce/core/xfce4-session/default.nix +++ b/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/pkgs/desktops/xfce/core/xfdesktop/default.nix b/pkgs/desktops/xfce/core/xfdesktop/default.nix index d47d4769a566..bc6a19346ece 100644 --- a/pkgs/desktops/xfce/core/xfdesktop/default.nix +++ b/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/pkgs/desktops/xfce/core/xfwm4/default.nix b/pkgs/desktops/xfce/core/xfwm4/default.nix index 179da89a5212..cc998487f165 100644 --- a/pkgs/desktops/xfce/core/xfwm4/default.nix +++ b/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/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix index a44e923d3563..baba34212fdc 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix +++ b/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/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix index bcd43d328e33..8f4751b1737b 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix +++ b/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/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix index f24a38c82a3a..8145f1a2af06 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix +++ b/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 ]; diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix index faee853808cc..f1a7420fbce7 100644 --- a/pkgs/development/libraries/bamf/default.nix +++ b/pkgs/development/libraries/bamf/default.nix @@ -7,7 +7,7 @@ , which , fetchgit , libgtop -, libwnck3 +, libwnck , glib , vala , pkg-config @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { glib libgtop libstartup_notification - libwnck3 + libwnck ]; patches = [ diff --git a/pkgs/development/libraries/libwnck/2.nix b/pkgs/development/libraries/libwnck/2.nix new file mode 100644 index 000000000000..fd7d80574a7d --- /dev/null +++ b/pkgs/development/libraries/libwnck/2.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchurl, pkg-config, gtk2, intltool, xorg }: + +stdenv.mkDerivation rec { + pname = "libwnck"; + version = "2.31.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "17isfjvrzgj5znld2a7zsk9vd39q9wnsysnw5jr8iz410z935xw3"; + }; + + outputs = [ "out" "dev" "devdoc" ]; + outputBin = "dev"; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ gtk2 intltool xorg.libX11 xorg.libXres ]; + # ?another optional: startup-notification + + configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK + + meta = { + description = "A library for creating task lists and pagers"; + homepage = "https://gitlab.gnome.org/GNOME/libwnck"; + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ johnazoidberg ]; + # ./xutils.h:31:10: fatal error: 'gdk/gdkx.h' file not found + # #include + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix deleted file mode 100644 index 425a1bab3550..000000000000 --- a/pkgs/development/libraries/libwnck/3.x.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ lib, stdenv -, fetchurl -, fetchpatch -, meson -, ninja -, pkg-config -, gtk-doc -, docbook_xsl -, docbook_xml_dtd_412 -, libX11 -, glib -, gtk3 -, pango -, cairo -, libXres -, libstartup_notification -, gettext -, gobject-introspection -, gnome -}: - -stdenv.mkDerivation rec { - pname = "libwnck"; - version = "3.36.0"; - - outputs = [ "out" "dev" "devdoc" ]; - outputBin = "dev"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0pwjdhca9lz2n1gf9b60xf0m6ipf9snp8rqf9csj4pgdnd882l5w"; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gettext - gobject-introspection - gtk-doc - docbook_xsl - docbook_xml_dtd_412 - ]; - - buildInputs = [ - libX11 - libstartup_notification - pango - cairo - libXres - ]; - - propagatedBuildInputs = [ - glib - gtk3 - ]; - - mesonFlags = [ - "-Dgtk_doc=true" - ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - attrPath = "${pname}${lib.versions.major version}"; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - description = "Library to manage X windows and workspaces (via pagers, tasklists, etc.)"; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/libwnck/default.nix b/pkgs/development/libraries/libwnck/default.nix index fd7d80574a7d..39a1d505b652 100644 --- a/pkgs/development/libraries/libwnck/default.nix +++ b/pkgs/development/libraries/libwnck/default.nix @@ -1,30 +1,76 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk2, intltool, xorg }: +{ lib, stdenv +, fetchurl +, fetchpatch +, meson +, ninja +, pkg-config +, gtk-doc +, docbook_xsl +, docbook_xml_dtd_412 +, libX11 +, glib +, gtk3 +, pango +, cairo +, libXres +, libstartup_notification +, gettext +, gobject-introspection +, gnome +}: stdenv.mkDerivation rec { pname = "libwnck"; - version = "2.31.0"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "17isfjvrzgj5znld2a7zsk9vd39q9wnsysnw5jr8iz410z935xw3"; - }; + version = "3.36.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 intltool xorg.libX11 xorg.libXres ]; - # ?another optional: startup-notification + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0pwjdhca9lz2n1gf9b60xf0m6ipf9snp8rqf9csj4pgdnd882l5w"; + }; - configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + gobject-introspection + gtk-doc + docbook_xsl + docbook_xml_dtd_412 + ]; - meta = { - description = "A library for creating task lists and pagers"; - homepage = "https://gitlab.gnome.org/GNOME/libwnck"; - license = lib.licenses.lgpl21; - maintainers = with lib.maintainers; [ johnazoidberg ]; - # ./xutils.h:31:10: fatal error: 'gdk/gdkx.h' file not found - # #include - broken = stdenv.isDarwin; + buildInputs = [ + libX11 + libstartup_notification + pango + cairo + libXres + ]; + + propagatedBuildInputs = [ + glib + gtk3 + ]; + + mesonFlags = [ + "-Dgtk_doc=true" + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "${pname}${lib.versions.major version}"; + versionPolicy = "odd-unstable"; + }; + }; + + meta = with lib; { + description = "Library to manage X windows and workspaces (via pagers, tasklists, etc.)"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ liff ]; }; } diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index a44b5ed8c767..3db895f4de01 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -8,7 +8,7 @@ , python3 , wrapGAppsHook , gnome -, libwnck3 +, libwnck , gobject-introspection , gettext , itstool @@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication rec { glib gnome.adwaita-icon-theme gtk3 - libwnck3 + libwnck ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix index 7da185050fb1..4e278b8cc620 100644 --- a/pkgs/tools/misc/clipster/default.nix +++ b/pkgs/tools/misc/clipster/default.nix @@ -1,4 +1,4 @@ -{fetchFromGitHub , lib, stdenv, python3, gtk3, libwnck3, +{fetchFromGitHub , lib, stdenv, python3, gtk3, libwnck, gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]); - buildInputs = [ pythonEnv gtk3 libwnck3 gobject-introspection wrapGAppsHook ]; + buildInputs = [ pythonEnv gtk3 libwnck gobject-introspection wrapGAppsHook ]; installPhase = '' sed -i 's/python/python3/g' clipster diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index cc4d33024b0b..018b746a51f6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -419,6 +419,7 @@ mapAliases ({ libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it."; # 2019-12-10 libstdcxxHook = throw "libstdcxx hook has been removed because cc-wrapper is now directly aware of the c++ standard library intended to be used."; # 2020-06-22 libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # added 2020-04-09 + libwnck3 = libwnck; lilypond-unstable = lilypond; # added 2021-03-11 links = links2; # added 2016-01-31 linux_rpi0 = linux_rpi1; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f0e626eb983..5c78b0647f1f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17071,9 +17071,8 @@ in libwmf = callPackage ../development/libraries/libwmf { }; - libwnck = libwnck2; - libwnck2 = callPackage ../development/libraries/libwnck { }; - libwnck3 = callPackage ../development/libraries/libwnck/3.x.nix { }; + libwnck = callPackage ../development/libraries/libwnck { }; + libwnck2 = callPackage ../development/libraries/libwnck/2.nix { }; libwpd = callPackage ../development/libraries/libwpd { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index db2359def2bd..36efc12582cc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8930,7 +8930,7 @@ let url = "mirror://cpan/authors/id/T/TS/TSCH/Gnome2-Wnck-0.16.tar.gz"; sha256 = "604a8ece88ac29f132d59b0caac27657ec31371c1606a4698a2160e88ac586e5"; }; - buildInputs = [ pkgs.libwnck pkgs.glib pkgs.gtk2 ]; + buildInputs = [ pkgs.libwnck2 pkgs.glib pkgs.gtk2 ]; propagatedBuildInputs = [ Gtk2 ]; meta = { description = "Perl interface to the Window Navigator Construction Kit";