From f4828f51ce67731a98ce30cab2773a9df20f4aa7 Mon Sep 17 00:00:00 2001 From: whispers Date: Thu, 23 Jul 2026 22:03:01 -0400 Subject: [PATCH 1/2] pidgin: disable gtkspell gtkspell is optional, and is being removed from Nixpkgs due to its dependence on GTK 2. --- .../networking/instant-messengers/pidgin/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index b30c26877e9e..491df0426dc4 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -13,7 +13,6 @@ gst_all_1, gtk2, gtk2-x11, - gtkspell2, intltool, lib, libice, @@ -94,7 +93,6 @@ let ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk2 - gtkspell2 farstream ] ++ lib.optional stdenv.hostPlatform.isDarwin gtk2-x11; @@ -126,16 +124,14 @@ let "--disable-nm" "--disable-tcl" "--disable-gevolution" + "--disable-gtkspell" ] ++ lib.optionals withCyrus_sasl [ "--enable-cyrus-sasl=yes" ] ++ lib.optionals withGnutls [ "--enable-gnutls=yes" "--enable-nss=no" ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "--disable-gtkspell" - "--disable-vv" - ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-vv" ] ++ lib.optionals stdenv.cc.isClang [ "CFLAGS=-Wno-error=int-conversion" ]; enableParallelBuilding = true; From f44b368058645b16f10e85196eae032ff8b99c4b Mon Sep 17 00:00:00 2001 From: whispers Date: Thu, 23 Jul 2026 22:03:01 -0400 Subject: [PATCH 2/2] gtkspell2: drop gtkspell2 is the port of the GtkSpell program to GTK 2, and is considered legacy by upstream. Most in-tree consumers have migrated to gtkspell3, so there's little reason to keep it around. The lone exception is pidgin, which had optional support and is also dependent on GTK 2, so we simply disable its gtkspell support. --- pkgs/by-name/gt/gtkspell2/gettext-0.25.patch | 15 ------ pkgs/by-name/gt/gtkspell2/package.nix | 57 -------------------- pkgs/top-level/aliases.nix | 1 + 3 files changed, 1 insertion(+), 72 deletions(-) delete mode 100644 pkgs/by-name/gt/gtkspell2/gettext-0.25.patch delete mode 100644 pkgs/by-name/gt/gtkspell2/package.nix diff --git a/pkgs/by-name/gt/gtkspell2/gettext-0.25.patch b/pkgs/by-name/gt/gtkspell2/gettext-0.25.patch deleted file mode 100644 index abe8c5446508..000000000000 --- a/pkgs/by-name/gt/gtkspell2/gettext-0.25.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index e926833..667a8e6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -12,6 +12,10 @@ AC_CONFIG_SRCDIR(gtkspell/gtkspell.c) - AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) - AC_CONFIG_HEADERS([config.h]) - -+AC_CONFIG_MACRO_DIRS([m4]) -+AM_GNU_GETTEXT_VERSION([0.25]) -+AM_GNU_GETTEXT([external]) -+ - SPELLER_LIB=-lenchant - - AC_SUBST(SPELLER_LIB) diff --git a/pkgs/by-name/gt/gtkspell2/package.nix b/pkgs/by-name/gt/gtkspell2/package.nix deleted file mode 100644 index ceab5f828149..000000000000 --- a/pkgs/by-name/gt/gtkspell2/package.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - stdenv, - lib, - fetchurl, - fetchpatch, - autoreconfHook, - docbook_xsl, - gtk-doc, - intltool, - pkg-config, - aspell, - enchant, - gtk2, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "gtkspell"; - version = "2.0.16"; - - src = fetchurl { - url = "mirror://sourceforge/gtkspell/gtkspell-${finalAttrs.version}.tar.gz"; - sha256 = "00hdv28bp72kg1mq2jdz1sdw2b8mb9iclsp7jdqwpck705bdriwg"; - }; - - patches = [ - # Fix build with gettext 0.25 - ./gettext-0.25.patch - # Build with enchant 2 - # https://github.com/archlinux/svntogit-packages/tree/packages/gtkspell/trunk - (fetchpatch { - url = "https://github.com/archlinux/svntogit-packages/raw/17fb30b5196db378c18e7c115f28e97b962b95ff/trunk/enchant-2.diff"; - sha256 = "0d9409bnapwzwhnfpz3dvl6qalskqa4lzmhrmciazsypbw3ry5rf"; - }) - ]; - - nativeBuildInputs = [ - autoreconfHook - docbook_xsl - gtk2 # GLIB_GNU_GETTEXT - gtk-doc - intltool - pkg-config - ]; - - buildInputs = [ - aspell - enchant - gtk2 - ]; - - meta = { - description = "Word-processor-style highlighting and replacement of misspelled words"; - homepage = "https://gtkspell.sourceforge.net"; - platforms = lib.platforms.unix; - license = lib.licenses.gpl2; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9d55f467d73f..2225511c7724 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1019,6 +1019,7 @@ mapAliases { gtkgnutella = gtk-gnutella; # Added 2026-05-21 gtklp = throw "'gtklp' has been removed, as it depended on GTK 2. Consider using 'system-config-printer' instead."; # Added 2026-05-22 gtkradiant = throw "'gtkradiant' has been removed, as it relies on gtk2"; # Added 2026-06-18 + gtkspell2 = throw "'gtkspell2' has been removed as it depended on the deprecated GTK2 engine. Consider using 'gtkspell3' instead"; # Added 2026-07-23 gtuber = throw "'gtuber' has been removed due to being discontinued by upstream."; # Added 2025-12-12 gui-for-clash = throw "'gui-for-clash' has been removed, as it is unmaintained"; # Added 2026-05-28 guile-disarchive = throw "'guile-disarchive' has been renamed to/replaced by 'disarchive'"; # Converted to throw 2025-10-27