From f19a64e770f5276516179e88097006508d19d06a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 3 Nov 2023 00:57:19 +0100 Subject: [PATCH 1/5] aqbanking: drop gtk2 --- pkgs/development/libraries/aqbanking/gwenhywfar.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/pkgs/development/libraries/aqbanking/gwenhywfar.nix index e6b535ffe4cf..4f2326b007a5 100644 --- a/pkgs/development/libraries/aqbanking/gwenhywfar.nix +++ b/pkgs/development/libraries/aqbanking/gwenhywfar.nix @@ -2,7 +2,7 @@ , which # GUI support -, gtk2, gtk3, qt5 +, gtk3, qt5 , pluginSearchPaths ? [ "/run/current-system/sw/lib/gwenhywfar/plugins" @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { ]; preConfigure = '' - configureFlagsArray+=("--with-guis=gtk2 gtk3 qt5") + configureFlagsArray+=("--with-guis=gtk3 qt5") ''; postPatch = let @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config gettext which ]; - buildInputs = [ gtk2 gtk3 qt5.qtbase gnutls openssl libgcrypt libgpg-error ]; + buildInputs = [ gtk3 qt5.qtbase gnutls openssl libgcrypt libgpg-error ]; dontWrapQtApps = true; From edb8b7994c383d3754cbb03b2bdb6016026e19cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 26 Oct 2023 22:32:39 +0200 Subject: [PATCH 2/5] pinentry: drop gtk2 --- pkgs/tools/security/pinentry/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index baa78521f345..dca48f4e2108 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -2,7 +2,7 @@ , libgpg-error, libassuan, qtbase, wrapQtAppsHook , ncurses, gtk2, gcr , withLibsecret ? true, libsecret -, enabledFlavors ? [ "curses" "tty" "gtk2" "emacs" ] +, enabledFlavors ? [ "curses" "tty" "emacs" ] ++ lib.optionals stdenv.isLinux [ "gnome3" ] ++ lib.optionals (!stdenv.isDarwin) [ "qt" ] }: From e222fc5802585b06c96469e2d481eb01546fa242 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 26 Oct 2023 01:36:15 +0200 Subject: [PATCH 3/5] plasma5Packages.breeze-gtk: drop gtk2 --- pkgs/desktops/plasma-5/breeze-gtk.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/desktops/plasma-5/breeze-gtk.nix b/pkgs/desktops/plasma-5/breeze-gtk.nix index b499ab034e50..3ecc5d5e5b0d 100644 --- a/pkgs/desktops/plasma-5/breeze-gtk.nix +++ b/pkgs/desktops/plasma-5/breeze-gtk.nix @@ -1,6 +1,4 @@ -{ mkDerivation, lib, extra-cmake-modules, gtk2, qtbase, sassc, python3, breeze-qt5 }: - -let inherit (lib) getLib; in +{ mkDerivation, extra-cmake-modules, qtbase, sassc, python3, breeze-qt5 }: mkDerivation { pname = "breeze-gtk"; @@ -9,9 +7,5 @@ mkDerivation { patches = [ ./patches/0001-fix-add-executable-bit.patch ]; - postPatch = '' - sed -i cmake/FindGTKEngine.cmake \ - -e "s|\''${KDE_INSTALL_FULL_LIBDIR}|${getLib gtk2}/lib|" - ''; cmakeFlags = [ "-DWITH_GTK3_VERSION=3.22" ]; } From b76ebfc6ccb7b76beeebc580355f9cb210c71206 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 26 Oct 2023 00:30:13 +0200 Subject: [PATCH 4/5] plasma5Packages.kde-gtk-config: build without gtk2 --- pkgs/desktops/plasma-5/kde-gtk-config/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix index a61fc328236d..c55193ae6429 100644 --- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix +++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix @@ -2,7 +2,6 @@ , extra-cmake-modules , wrapGAppsHook , glib -, gtk2 , gtk3 , karchive , kcmutils @@ -25,7 +24,6 @@ mkDerivation { ki18n kio glib - gtk2 gtk3 karchive kcmutils @@ -39,7 +37,6 @@ mkDerivation { ]; cmakeFlags = [ "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" - "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" "-DGLIB_SCHEMAS_DIR=${gsettings-desktop-schemas.out}/" ]; # The gtkconfig KDED module will crash the daemon if the GSettings schemas From 2b122abc406018898e143985d5fe92dc20f4dee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 25 Oct 2023 23:04:17 +0200 Subject: [PATCH 5/5] ibus: build without gtk2 --- pkgs/tools/inputmethods/ibus/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 848758b54146..5bbaa0629ed4 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -14,7 +14,6 @@ , glib , gdk-pixbuf , gobject-introspection -, gtk2 , gtk3 , gtk4 , gtk-doc @@ -103,6 +102,7 @@ stdenv.mkDerivation rec { (lib.enableFeature (libnotify != null) "libnotify") (lib.enableFeature withWayland "wayland") (lib.enableFeature enableUI "ui") + "--disable-gtk2" "--enable-gtk4" "--enable-install-tests" "--with-unicode-emoji-dir=${unicode-emoji}/share/unicode/emoji" @@ -144,7 +144,6 @@ stdenv.mkDerivation rec { dconf gdk-pixbuf python3.pkgs.pygobject3 # for pygobject overrides - gtk2 gtk3 gtk4 isocodes