diff --git a/pkgs/applications/misc/devilspie2/default.nix b/pkgs/applications/misc/devilspie2/default.nix index 8fc86ff3a3ba..a9d002d49331 100644 --- a/pkgs/applications/misc/devilspie2/default.nix +++ b/pkgs/applications/misc/devilspie2/default.nix @@ -5,7 +5,7 @@ intltool, pkg-config, glib, - gtk, + gtk3, lua, libwnck, }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ glib - gtk + gtk3 lua libwnck ]; diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 20c7b060a78e..a1fdd3de369d 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -9,7 +9,7 @@ dbus, xvfb-run, glib, - gtk, + gtk3, gettext, libiconv, json-glib, @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib - gtk + gtk3 ]; nativeCheckInputs = [ diff --git a/pkgs/applications/misc/swappy/default.nix b/pkgs/applications/misc/swappy/default.nix index 848e73ff2df3..91afa5de1f1b 100644 --- a/pkgs/applications/misc/swappy/default.nix +++ b/pkgs/applications/misc/swappy/default.nix @@ -7,7 +7,7 @@ wayland, cairo, pango, - gtk, + gtk3, pkg-config, scdoc, libnotify, @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo pango - gtk + gtk3 libnotify wayland glib diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 899e1ee92fba..3ca3f6b8655a 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -11,7 +11,7 @@ json-glib, desktop-file-utils, python3, - gtk, + gtk3, girara, gettext, gnome, @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ - gtk + gtk3 girara libintl sqlite diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix index 88241856632d..9290e079d480 100644 --- a/pkgs/applications/misc/zathura/default.nix +++ b/pkgs/applications/misc/zathura/default.nix @@ -3,7 +3,6 @@ lib, stdenv, newScope, - gtk3, useMupdf ? true, }: @@ -15,8 +14,6 @@ lib.makeScope newScope ( { inherit useMupdf; - gtk = gtk3; - zathura_core = callPackage ./core { }; zathura_pdf_poppler = callPackage ./pdf-poppler { }; diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix index 87ac40d1b204..70761922fc6b 100644 --- a/pkgs/applications/misc/zathura/djvu/default.nix +++ b/pkgs/applications/misc/zathura/djvu/default.nix @@ -5,7 +5,7 @@ meson, ninja, pkg-config, - gtk, + gtk3, zathura_core, girara, djvulibre, @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { djvulibre gettext zathura_core - gtk + gtk3 girara ]; diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix index 2e8e52b3efe4..8a38ab27a506 100644 --- a/pkgs/applications/networking/browsers/surf/default.nix +++ b/pkgs/applications/networking/browsers/surf/default.nix @@ -8,7 +8,7 @@ gcr, glib-networking, gsettings-desktop-schemas, - gtk, + gtk2, libsoup_2_4, webkitgtk_4_0, xorg, @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { gcr glib-networking gsettings-desktop-schemas - gtk + gtk2 libsoup_2_4 webkitgtk_4_0 ] diff --git a/pkgs/applications/networking/ftp/gftp/default.nix b/pkgs/applications/networking/ftp/gftp/default.nix index 361abf88c2d8..9f6a1f4fb2f8 100644 --- a/pkgs/applications/networking/ftp/gftp/default.nix +++ b/pkgs/applications/networking/ftp/gftp/default.nix @@ -5,7 +5,7 @@ autoconf, automake, gettext, - gtk, + gtk2, intltool, libtool, ncurses, @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk + gtk2 ncurses openssl readline diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index e28b7614b7f1..b58bdc620c46 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -2,7 +2,7 @@ fetchFromGitHub, lib, stdenv, - gtk, + gtk3, pkg-config, libgsf, libofx, @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - gtk + gtk3 libgsf libofx adwaita-icon-theme diff --git a/pkgs/applications/terminal-emulators/stupidterm/default.nix b/pkgs/applications/terminal-emulators/stupidterm/default.nix index 379bd1d94278..7d82681b92df 100644 --- a/pkgs/applications/terminal-emulators/stupidterm/default.nix +++ b/pkgs/applications/terminal-emulators/stupidterm/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, pkg-config, vte, - gtk, + gtk3, pcre2, nixosTests, }: @@ -17,7 +17,7 @@ stdenv.mkDerivation { buildInputs = [ vte - gtk + gtk3 pcre2 ]; diff --git a/pkgs/desktops/rox/rox-filer/default.nix b/pkgs/desktops/rox/rox-filer/default.nix index cffa6eca1bf7..841e70157316 100644 --- a/pkgs/desktops/rox/rox-filer/default.nix +++ b/pkgs/desktops/rox/rox-filer/default.nix @@ -6,7 +6,7 @@ pkg-config, wrapGAppsHook3, libxml2, - gtk, + gtk2, libSM, shared-mime-info, }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ libxml2 - gtk + gtk2 shared-mime-info libSM ]; diff --git a/pkgs/development/libraries/gtk-mac-integration/default.nix b/pkgs/development/libraries/gtk-mac-integration/default.nix index 383fab6b5f68..d2d56bec0da0 100644 --- a/pkgs/development/libraries/gtk-mac-integration/default.nix +++ b/pkgs/development/libraries/gtk-mac-integration/default.nix @@ -6,7 +6,8 @@ pkg-config, glib, gtk-doc, - gtk, + gtk ? gtk3, + gtk3, gobject-introspection, }: diff --git a/pkgs/tools/X11/xbindkeys-config/default.nix b/pkgs/tools/X11/xbindkeys-config/default.nix index 660c1e2c8843..3a0bb35223cf 100644 --- a/pkgs/tools/X11/xbindkeys-config/default.nix +++ b/pkgs/tools/X11/xbindkeys-config/default.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - gtk, + gtk2, pkg-config, procps, makeWrapper, @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pkg-config makeWrapper ]; - buildInputs = [ gtk ]; + buildInputs = [ gtk2 ]; src = fetchurl { url = "mirror://debian/pool/main/x/xbindkeys-config/xbindkeys-config_${version}.orig.tar.gz"; diff --git a/pkgs/tools/misc/gbdfed/default.nix b/pkgs/tools/misc/gbdfed/default.nix index 1d72d2c05f44..71e89cf5b38f 100644 --- a/pkgs/tools/misc/gbdfed/default.nix +++ b/pkgs/tools/misc/gbdfed/default.nix @@ -4,7 +4,7 @@ fetchurl, pkg-config, freetype, - gtk, + gtk2-x11, }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ freetype - gtk + gtk2-x11 ]; patches = [ ./Makefile.patch ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed74ff44032a..6b27c8d54ba2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1644,9 +1644,7 @@ with pkgs; xst = callPackage ../applications/terminal-emulators/st/xst.nix { }; mcaimi-st = callPackage ../applications/terminal-emulators/st/mcaimi-st.nix { }; - stupidterm = callPackage ../applications/terminal-emulators/stupidterm { - gtk = gtk3; - }; + stupidterm = callPackage ../applications/terminal-emulators/stupidterm { }; termite = callPackage ../applications/terminal-emulators/termite/wrapper.nix { termite = termite-unwrapped; @@ -2684,7 +2682,7 @@ with pkgs; steampipePackages = recurseIntoAttrs (callPackage ../tools/misc/steampipe-packages { }); - swappy = callPackage ../applications/misc/swappy { gtk = gtk3; }; + swappy = callPackage ../applications/misc/swappy { }; synth = callPackage ../tools/misc/synth { inherit (darwin.apple_sdk.frameworks) AppKit Security; @@ -3132,9 +3130,7 @@ with pkgs; dconf2nix = callPackage ../development/tools/haskell/dconf2nix { }; - devilspie2 = callPackage ../applications/misc/devilspie2 { - gtk = gtk3; - }; + devilspie2 = callPackage ../applications/misc/devilspie2 { }; ddcui = libsForQt5.callPackage ../applications/misc/ddcui { }; @@ -3484,13 +3480,9 @@ with pkgs; gawkInteractive = gawk.override { interactive = true; }; - gbdfed = callPackage ../tools/misc/gbdfed { - gtk = gtk2-x11; - }; + gbdfed = callPackage ../tools/misc/gbdfed { }; - gftp = callPackage ../applications/networking/ftp/gftp { - gtk = gtk2; - }; + gftp = callPackage ../applications/networking/ftp/gftp { }; ggshield = callPackage ../tools/security/ggshield { python3 = python311; @@ -9606,9 +9598,7 @@ with pkgs; gtk-sharp-3_0 = callPackage ../development/libraries/gtk-sharp/3.0.nix { }; - gtk-mac-integration = callPackage ../development/libraries/gtk-mac-integration { - gtk = gtk3; - }; + gtk-mac-integration = callPackage ../development/libraries/gtk-mac-integration { }; gtk-mac-integration-gtk2 = gtk-mac-integration.override { gtk = gtk2; @@ -14328,9 +14318,7 @@ with pkgs; gimpPlugins = recurseIntoAttrs (callPackage ../applications/graphics/gimp/plugins { }); - girara = callPackage ../applications/misc/girara { - gtk = gtk3; - }; + girara = callPackage ../applications/misc/girara { }; gtk-pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer { withGtk3 = true; }; @@ -14409,7 +14397,7 @@ with pkgs; graphicsmagick_q16 = graphicsmagick.override { quantumdepth = 16; }; graphicsmagick-imagemagick-compat = graphicsmagick.imagemagick-compat; - grisbi = callPackage ../applications/office/grisbi { gtk = gtk3; }; + grisbi = callPackage ../applications/office/grisbi { }; q4wine = libsForQt5.callPackage ../applications/misc/q4wine { }; @@ -16003,7 +15991,7 @@ with pkgs; pythonBindings = true; }; - surf = callPackage ../applications/networking/browsers/surf { gtk = gtk2; }; + surf = callPackage ../applications/networking/browsers/surf { }; surge = callPackage ../applications/audio/surge { git = gitMinimal; @@ -17590,9 +17578,7 @@ with pkgs; # Needed for elementary's gala, wingpanel and greeter until support for higher versions is provided pantheon = recurseIntoAttrs (callPackage ../desktops/pantheon { }); - rox-filer = callPackage ../desktops/rox/rox-filer { - gtk = gtk2; - }; + rox-filer = callPackage ../desktops/rox/rox-filer { }; xfce = recurseIntoAttrs (callPackage ../desktops/xfce { });