libwnck: make 3.36.0 default

This commit is contained in:
Olli Helenius 2021-06-23 21:22:04 +03:00
parent 920113a6e5
commit 8609f3fd20
No known key found for this signature in database
GPG key ID: 65B7BEC581BD1DD1
43 changed files with 178 additions and 169 deletions

View file

@ -310,13 +310,19 @@
</itemizedlist> </itemizedlist>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
<itemizedlist spacing="compact"> <itemizedlist>
<listitem> <listitem>
<para> <para>
The <literal>antlr</literal> package now defaults to the 4.x The <literal>antlr</literal> package now defaults to the 4.x
release instead of the old 2.7.7 version. release instead of the old 2.7.7 version.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
The <literal>libwnck</literal> package now defaults to the 3.x
release instead of the old 2.31.0 version.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>
<section xml:id="sec-release-21.11-notable-changes"> <section xml:id="sec-release-21.11-notable-changes">

View file

@ -78,6 +78,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 * The `antlr` package now defaults to the 4.x release instead of the
old 2.7.7 version. 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} ## 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. - 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.

View file

@ -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 { stdenv.mkDerivation rec {
pname = "devilspie2"; pname = "devilspie2";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ intltool pkg-config ]; nativeBuildInputs = [ intltool pkg-config ];
buildInputs = [ glib gtk lua libwnck3 ]; buildInputs = [ glib gtk lua libwnck ];
installPhase = '' installPhase = ''
mkdir -p $out/bin $out/share/man/man1 mkdir -p $out/bin $out/share/man/man1

View file

@ -4,7 +4,7 @@
, gobject-introspection , gobject-introspection
, gtk3 , gtk3
, keybinder3 , keybinder3
, libwnck3 , libwnck
, python3Packages , python3Packages
, wrapGAppsHook , wrapGAppsHook
}: }:
@ -31,7 +31,7 @@ python3Packages.buildPythonApplication rec {
buildInputs = [ buildInputs = [
gobject-introspection gobject-introspection
gtk3 gtk3
libwnck3 libwnck
keybinder3 keybinder3
]; ];

View file

@ -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 , appindicatorSupport ? true, libayatana-appindicator-gtk3
}: }:
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkg-config autoreconfHook ]; 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"; configureFlags = lib.optional appindicatorSupport "--enable-appindicator=yes";
outputs = [ "out" "man" ]; outputs = [ "out" "man" ];

View file

@ -5,7 +5,7 @@
, gobject-introspection , gobject-introspection
, gtk3 , gtk3
, itstool , itstool
, libwnck3 , libwnck
, keybinder3 , keybinder3
, desktop-file-utils , desktop-file-utils
, shared-mime-info , shared-mime-info
@ -34,7 +34,7 @@ buildPythonApplication rec {
desktop-file-utils # for update-desktop-database desktop-file-utils # for update-desktop-database
shared-mime-info # for update-mime-info shared-mime-info # for update-mime-info
]; ];
buildInputs = [ docutils libwnck3 keybinder3 ]; buildInputs = [ docutils libwnck keybinder3 ];
propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ]; propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ];
# without strictDeps kupfer fails to build: Could not find the python module 'gi.repository.Gtk' # without strictDeps kupfer fails to build: Could not find the python module 'gi.repository.Gtk'

View file

@ -5,7 +5,7 @@
, gnome , gnome
, libnotify , libnotify
, libtool , libtool
, libwnck3 , libwnck
, makeWrapper , makeWrapper
, pkg-config , pkg-config
, gsettings-desktop-schemas , gsettings-desktop-schemas
@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ buildInputs = [
glib libwnck3 libnotify dbus-glib makeWrapper glib libwnck libnotify dbus-glib makeWrapper
gsettings-desktop-schemas gnome.gnome-common gsettings-desktop-schemas gnome.gnome-common
libtool libtool
]; ];

View file

@ -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 { stdenv.mkDerivation rec {
pname = "notify-osd"; pname = "notify-osd";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ buildInputs = [
glib libwnck3 libnotify dbus-glib makeWrapper glib libwnck libnotify dbus-glib makeWrapper
gsettings-desktop-schemas gsettings-desktop-schemas
]; ];

View file

@ -7,7 +7,7 @@
, glib , glib
, gnome , gnome
, gtk3 , gtk3
, libwnck3 , libwnck
, libX11 , libX11
, libXfixes , libXfixes
, libXi , libXi
@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
libXi libXi
libdbusmenu-gtk3 libdbusmenu-gtk3
libgee libgee
libwnck3 libwnck
pango pango
]; ];

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, pkg-config { lib, stdenv, fetchFromGitHub, cmake, makeWrapper, pkg-config
, glib, libwnck3, procps }: , glib, libwnck, procps }:
with lib; with lib;
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "man" "doc" ]; outputs = [ "out" "man" "doc" ];
nativeBuildInputs = [ cmake pkg-config makeWrapper ]; nativeBuildInputs = [ cmake pkg-config makeWrapper ];
buildInputs = [ glib libwnck3 ]; buildInputs = [ glib libwnck ];
postInstall = '' postInstall = ''
wrapProgram $out/bin/xsuspender \ wrapProgram $out/bin/xsuspender \

View file

@ -11,7 +11,7 @@
, glib , glib
, gtk3 , gtk3
, bamf , bamf
, libwnck3 , libwnck
, libgee , libgee
, libgtop , libgtop
, wrapGAppsHook , wrapGAppsHook
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
pantheon.wingpanel pantheon.wingpanel
libgee libgee
libgtop libgtop
libwnck3 libwnck
]; ];
postPatch = '' postPatch = ''

View file

@ -9,7 +9,7 @@
, libnotify , libnotify
, libutempter , libutempter
, vte , vte
, libwnck3 , libwnck
}: }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
@ -41,7 +41,7 @@ python3.pkgs.buildPythonApplication rec {
gtk3 gtk3
keybinder3 keybinder3
libnotify libnotify
libwnck3 libwnck
python3 python3
vte vte
]; ];

View file

@ -1,5 +1,5 @@
{ lib, fetchurl, substituteAll, python3, gst_all_1, wrapGAppsHook, gobject-introspection { 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 }: , fetchpatch }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
nativeBuildInputs = [ gobject-introspection python3.pkgs.distutils_extra intltool wrapGAppsHook ]; nativeBuildInputs = [ gobject-introspection python3.pkgs.distutils_extra intltool wrapGAppsHook ];
buildInputs = [ 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 keybinder3 libappindicator-gtk3
]; ];

View file

@ -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 let
inherit (python2.pkgs) python pygtk; inherit (python2.pkgs) python pygtk;
@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtk2 librsvg libwnck libgtop python ]; buildInputs = [ gtk2 librsvg libwnck2 libgtop python ];
propagatedBuildInputs = [ gnome_python pygtk ]; propagatedBuildInputs = [ gnome_python pygtk ];
# gnome-python-desktop expects that .pth file is already installed by PyGTK # gnome-python-desktop expects that .pth file is already installed by PyGTK

View file

@ -74,7 +74,7 @@ lib.makeScope pkgs.newScope (self: with self; {
glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 libcanberra-gtk2 glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 libcanberra-gtk2
# Included for backwards compatibility # 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 gvfs # added 2019-09-03
; ;

View file

@ -11,7 +11,7 @@
, at-spi2-core , at-spi2-core
, dbus , dbus
, gettext , gettext
, libwnck3 , libwnck
, adwaita-icon-theme , adwaita-icon-theme
}: }:
@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication rec {
adwaita-icon-theme adwaita-icon-theme
at-spi2-core at-spi2-core
gtk3 gtk3
libwnck3 libwnck
]; ];
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [

View file

@ -7,7 +7,7 @@
, gnome-panel , gnome-panel
, gtk3 , gtk3
, glib , glib
, libwnck3 , libwnck
, libgtop , libgtop
, libnotify , libnotify
, upower , upower
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
gtk3 gtk3
glib glib
libxml2 libxml2
libwnck3 libwnck
libgtop libgtop
libnotify libnotify
upower upower

View file

@ -13,7 +13,7 @@
, itstool , itstool
, libgweather , libgweather
, libsoup , libsoup
, libwnck3 , libwnck
, libxml2 , libxml2
, pkg-config , pkg-config
, polkit , polkit
@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
gtk3 gtk3
libgweather libgweather
libsoup libsoup
libwnck3 libwnck
polkit polkit
systemd systemd
]; ];

View file

@ -10,7 +10,7 @@
, gtk2 , gtk2
, libX11 , libX11
, libfm , libfm
, libwnck , libwnck2
, libXmu , libXmu
, libXpm , libXpm
, cairo , cairo
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
gtk2 gtk2
libX11 libX11
libfm libfm
libwnck libwnck2
libXmu libXmu
libXpm libXpm
cairo cairo

View file

@ -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 , libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook
, mateUpdateScript }: , mateUpdateScript }:
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
gtk3 gtk3
gtksourceview3 gtksourceview3
gnome.gucharmap gnome.gucharmap
libwnck3 libwnck
libgtop libgtop
libxml2 libxml2
libnotify libnotify

View file

@ -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 { stdenv.mkDerivation rec {
pname = "mate-netbook"; pname = "mate-netbook";
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gtk3 gtk3
libwnck3 libwnck
libfakekey libfakekey
libXtst libXtst
mate.mate-panel mate.mate-panel

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, gettext, glib, libcanberra-gtk3, { lib, stdenv, fetchurl, pkg-config, gettext, glib, libcanberra-gtk3,
libnotify, libwnck3, gtk3, libxml2, wrapGAppsHook, mateUpdateScript }: libnotify, libwnck, gtk3, libxml2, wrapGAppsHook, mateUpdateScript }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-notification-daemon"; pname = "mate-notification-daemon";
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
libcanberra-gtk3 libcanberra-gtk3
libnotify libnotify
libwnck3 libwnck
gtk3 gtk3
]; ];

View file

@ -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 { stdenv.mkDerivation rec {
pname = "mate-panel"; pname = "mate-panel";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
glib glib
libwnck3 libwnck
librsvg librsvg
libxml2 libxml2
gtk3 gtk3

View file

@ -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 { stdenv.mkDerivation rec {
pname = "mate-system-monitor"; pname = "mate-system-monitor";
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
gtkmm3 gtkmm3
libxml2 libxml2
libgtop libgtop
libwnck3 libwnck
librsvg librsvg
polkit polkit
systemd systemd

View file

@ -7,7 +7,7 @@
, dconf , dconf
, glib , glib
, gtk3 , gtk3
, libwnck3 , libwnck
, libX11 , libX11
, libXfixes , libXfixes
, libXi , libXi
@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
libXi libXi
libdbusmenu-gtk3 libdbusmenu-gtk3
libgee libgee
libwnck3 libwnck
pango pango
]; ];

View file

@ -1,4 +1,4 @@
{ mkXfceDerivation, exo, gtk3, libwnck3, libXmu }: { mkXfceDerivation, exo, gtk3, libwnck, libXmu }:
mkXfceDerivation { mkXfceDerivation {
category = "apps"; category = "apps";
@ -8,7 +8,7 @@ mkXfceDerivation {
sha256 = "sha256-jcICXPtG/7t0U0xqgvU52mjiA8wsyw7JQ0OmNjwA89A="; sha256 = "sha256-jcICXPtG/7t0U0xqgvU52mjiA8wsyw7JQ0OmNjwA89A=";
nativeBuildInputs = [ exo ]; nativeBuildInputs = [ exo ];
buildInputs = [ gtk3 libwnck3 libXmu ]; buildInputs = [ gtk3 libwnck libXmu ];
meta = { meta = {
description = "Easy to use task manager for Xfce"; description = "Easy to use task manager for Xfce";

View file

@ -4,7 +4,7 @@
, libXinerama , libXinerama
, libXdamage , libXdamage
, libX11 , libX11
, libwnck3 , libwnck
, libxfce4ui , libxfce4ui
, libxfce4util , libxfce4util
, garcon , garcon
@ -33,7 +33,7 @@ mkXfceDerivation {
libXcomposite libXcomposite
libXdamage libXdamage
libXinerama libXinerama
libwnck3 libwnck
libxfce4ui libxfce4ui
libxfce4util libxfce4util
xfconf xfconf

View file

@ -5,7 +5,7 @@
, gobject-introspection , gobject-introspection
, gtk3 , gtk3
, libdbusmenu-gtk3 , libdbusmenu-gtk3
, libwnck3 , libwnck
, libxfce4ui , libxfce4ui
, libxfce4util , libxfce4util
, tzdata , tzdata
@ -30,7 +30,7 @@ mkXfceDerivation {
garcon garcon
libdbusmenu-gtk3 libdbusmenu-gtk3
libxfce4ui libxfce4ui
libwnck3 libwnck
xfconf xfconf
tzdata tzdata
]; ];

View file

@ -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 { mkXfceDerivation {
category = "xfce"; category = "xfce";
@ -7,7 +7,7 @@ mkXfceDerivation {
sha256 = "sha256-LIRAQ1YAkAHwIzC5NYV/0iFLkAP5V96wuTIrYTGbGy0="; 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"}" ]; configureFlags = [ "--with-xsession-prefix=${placeholder "out"}" ];

View file

@ -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 { mkXfceDerivation {
category = "xfce"; category = "xfce";
@ -12,7 +12,7 @@ mkXfceDerivation {
gtk3 gtk3
libxfce4ui libxfce4ui
libxfce4util libxfce4util
libwnck3 libwnck
xfconf xfconf
libnotify libnotify
garcon garcon

View file

@ -1,5 +1,5 @@
{ mkXfceDerivation, exo, librsvg, dbus-glib, epoxy, gtk3, libXdamage { mkXfceDerivation, exo, librsvg, dbus-glib, epoxy, gtk3, libXdamage
, libstartup_notification, libxfce4ui, libxfce4util, libwnck3 , libstartup_notification, libxfce4ui, libxfce4util, libwnck
, libXpresent, xfconf }: , libXpresent, xfconf }:
mkXfceDerivation { mkXfceDerivation {
@ -19,7 +19,7 @@ mkXfceDerivation {
libstartup_notification libstartup_notification
libxfce4ui libxfce4ui
libxfce4util libxfce4util
libwnck3 libwnck
libXpresent libXpresent
xfconf xfconf
]; ];

View file

@ -1,5 +1,5 @@
{ lib, stdenv, pkg-config, fetchFromGitHub, python3, vala_0_46 { 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 { stdenv.mkDerivation rec {
pname = "xfce4-namebar-plugin"; pname = "xfce4-namebar-plugin";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkg-config vala_0_46 wafHook python3 ]; nativeBuildInputs = [ pkg-config vala_0_46 wafHook python3 ];
buildInputs = [ gtk3 libwnck3 libxfce4util xfce4-panel ]; buildInputs = [ gtk3 libwnck libxfce4util xfce4-panel ];
postPatch = '' postPatch = ''
substituteInPlace src/namebar.vala --replace 'var dirs = Environment.get_system_data_dirs()' "string[] dirs = { \"$out/share\" }" substituteInPlace src/namebar.vala --replace 'var dirs = Environment.get_system_data_dirs()' "string[] dirs = { \"$out/share\" }"

View file

@ -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 { stdenv.mkDerivation rec {
pname = "xfce4-windowck-plugin"; pname = "xfce4-windowck-plugin";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
python3 python3
imagemagick imagemagick
libwnck3 libwnck
libxfce4ui libxfce4ui
xfce4-panel xfce4-panel
xfconf xfconf

View file

@ -2,7 +2,7 @@
, mkXfceDerivation , mkXfceDerivation
, gtk3 , gtk3
, librsvg , librsvg
, libwnck3 , libwnck
, libxklavier , libxklavier
, garcon , garcon
, libxfce4ui , libxfce4ui
@ -25,7 +25,7 @@ mkXfceDerivation {
libxfce4ui libxfce4ui
libxfce4util libxfce4util
libxklavier libxklavier
libwnck3 libwnck
xfce4-panel xfce4-panel
xfconf xfconf
]; ];

View file

@ -7,7 +7,7 @@
, which , which
, fetchgit , fetchgit
, libgtop , libgtop
, libwnck3 , libwnck
, glib , glib
, vala , vala
, pkg-config , pkg-config
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
glib glib
libgtop libgtop
libstartup_notification libstartup_notification
libwnck3 libwnck
]; ];
patches = [ patches = [

View file

@ -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 <gdk/gdkx.h>
broken = stdenv.isDarwin;
};
}

View file

@ -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 = [ ];
};
}

View file

@ -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 { stdenv.mkDerivation rec {
pname = "libwnck"; pname = "libwnck";
version = "2.31.0"; version = "3.36.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "17isfjvrzgj5znld2a7zsk9vd39q9wnsysnw5jr8iz410z935xw3";
};
outputs = [ "out" "dev" "devdoc" ]; outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev"; outputBin = "dev";
nativeBuildInputs = [ pkg-config ]; src = fetchurl {
buildInputs = [ gtk2 intltool xorg.libX11 xorg.libXres ]; url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
# ?another optional: startup-notification 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 = { buildInputs = [
description = "A library for creating task lists and pagers"; libX11
homepage = "https://gitlab.gnome.org/GNOME/libwnck"; libstartup_notification
license = lib.licenses.lgpl21; pango
maintainers = with lib.maintainers; [ johnazoidberg ]; cairo
# ./xutils.h:31:10: fatal error: 'gdk/gdkx.h' file not found libXres
# #include <gdk/gdkx.h> ];
broken = stdenv.isDarwin;
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 ];
}; };
} }

View file

@ -8,7 +8,7 @@
, python3 , python3
, wrapGAppsHook , wrapGAppsHook
, gnome , gnome
, libwnck3 , libwnck
, gobject-introspection , gobject-introspection
, gettext , gettext
, itstool , itstool
@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication rec {
glib glib
gnome.adwaita-icon-theme gnome.adwaita-icon-theme
gtk3 gtk3
libwnck3 libwnck
]; ];
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [

View file

@ -1,4 +1,4 @@
{fetchFromGitHub , lib, stdenv, python3, gtk3, libwnck3, {fetchFromGitHub , lib, stdenv, python3, gtk3, libwnck,
gobject-introspection, wrapGAppsHook }: gobject-introspection, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]); pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]);
buildInputs = [ pythonEnv gtk3 libwnck3 gobject-introspection wrapGAppsHook ]; buildInputs = [ pythonEnv gtk3 libwnck gobject-introspection wrapGAppsHook ];
installPhase = '' installPhase = ''
sed -i 's/python/python3/g' clipster sed -i 's/python/python3/g' clipster

View file

@ -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 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 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 libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # added 2020-04-09
libwnck3 = libwnck;
lilypond-unstable = lilypond; # added 2021-03-11 lilypond-unstable = lilypond; # added 2021-03-11
links = links2; # added 2016-01-31 links = links2; # added 2016-01-31
linux_rpi0 = linux_rpi1; linux_rpi0 = linux_rpi1;

View file

@ -17063,9 +17063,8 @@ in
libwmf = callPackage ../development/libraries/libwmf { }; libwmf = callPackage ../development/libraries/libwmf { };
libwnck = libwnck2; libwnck = callPackage ../development/libraries/libwnck { };
libwnck2 = callPackage ../development/libraries/libwnck { }; libwnck2 = callPackage ../development/libraries/libwnck/2.nix { };
libwnck3 = callPackage ../development/libraries/libwnck/3.x.nix { };
libwpd = callPackage ../development/libraries/libwpd { }; libwpd = callPackage ../development/libraries/libwpd { };

View file

@ -8930,7 +8930,7 @@ let
url = "mirror://cpan/authors/id/T/TS/TSCH/Gnome2-Wnck-0.16.tar.gz"; url = "mirror://cpan/authors/id/T/TS/TSCH/Gnome2-Wnck-0.16.tar.gz";
sha256 = "604a8ece88ac29f132d59b0caac27657ec31371c1606a4698a2160e88ac586e5"; sha256 = "604a8ece88ac29f132d59b0caac27657ec31371c1606a4698a2160e88ac586e5";
}; };
buildInputs = [ pkgs.libwnck pkgs.glib pkgs.gtk2 ]; buildInputs = [ pkgs.libwnck2 pkgs.glib pkgs.gtk2 ];
propagatedBuildInputs = [ Gtk2 ]; propagatedBuildInputs = [ Gtk2 ];
meta = { meta = {
description = "Perl interface to the Window Navigator Construction Kit"; description = "Perl interface to the Window Navigator Construction Kit";