Merge #239191: treewide: gobject-introspection from buildInputs to nativeBuildInputs

...into staging
2023-07-26 20:53:32 +02:00 · 2023-07-26 20:53:32 +02:00 · 1c0d654684
commit 1c0d654684
parent e8f8e5829f 9999bf7a21
100 changed files with 117 additions and 132 deletions
--- a/pkgs/applications/audio/hushboard/default.nix
+++ b/pkgs/applications/audio/hushboard/default.nix
@ -26,10 +26,10 @@ buildPythonApplication {

  nativeBuildInputs = [
    wrapGAppsHook
+    gobject-introspection
  ];

  buildInputs = [
-    gobject-introspection
    gtk3
    libappindicator
    libpulseaudio
--- a/pkgs/applications/audio/lyrebird/default.nix
+++ b/pkgs/applications/audio/lyrebird/default.nix
@ -34,9 +34,9 @@ python3Packages.buildPythonApplication rec {

  propagatedBuildInputs = with python3Packages; [ toml pygobject3 ];

-  nativeBuildInputs = [ wrapGAppsHook ];
+  nativeBuildInputs = [ wrapGAppsHook gobject-introspection ];

-  buildInputs = [ gtk3 gobject-introspection sox ];
+  buildInputs = [ gtk3 sox ];

  dontWrapGApps = true;
  makeWrapperArgs = [
--- a/pkgs/applications/audio/rhythmbox/default.nix
+++ b/pkgs/applications/audio/rhythmbox/default.nix
@ -52,6 +52,7 @@ stdenv.mkDerivation rec {
    itstool
    wrapGAppsHook
    desktop-file-utils
+    gobject-introspection
  ];

  buildInputs = [
@ -72,7 +73,6 @@ stdenv.mkDerivation rec {
    brasero
    grilo

-    gobject-introspection
    python3.pkgs.pygobject3

    gst_all_1.gstreamer
--- a/pkgs/applications/audio/soundconverter/default.nix
+++ b/pkgs/applications/audio/soundconverter/default.nix
@ -17,7 +17,6 @@ python3Packages.buildPythonApplication rec {
  buildInputs = [
    gtk3
    fdk-aac-encoder
-    gobject-introspection
    gst_all_1.gst-libav
    gst_all_1.gst-plugins-base
    gst_all_1.gst-plugins-good
@ -28,6 +27,7 @@ python3Packages.buildPythonApplication rec {
  nativeBuildInputs = [
    intltool
    wrapGAppsHook
+    gobject-introspection
  ];

  propagatedBuildInputs = [
--- a/pkgs/applications/audio/tauon/default.nix
+++ b/pkgs/applications/audio/tauon/default.nix
@ -70,11 +70,11 @@ stdenv.mkDerivation (finalAttrs: {
  nativeBuildInputs = [
    pkg-config
    python3Packages.wrapPython
+    gobject-introspection
  ];

  buildInputs = [
    flac
-    gobject-introspection
    gtk3
    libappindicator
    libnotify
--- a/pkgs/applications/editors/apostrophe/default.nix
+++ b/pkgs/applications/editors/apostrophe/default.nix
@ -24,9 +24,9 @@ in stdenv.mkDerivation rec {
  };

  nativeBuildInputs = [ meson ninja pkg-config desktop-file-utils
-    appstream-glib wrapGAppsHook sassc ];
+    appstream-glib wrapGAppsHook sassc gobject-introspection ];

-  buildInputs = [ glib pythonEnv gobject-introspection gtk3
+  buildInputs = [ glib pythonEnv gtk3
    gnome.adwaita-icon-theme webkitgtk gspell texlive
    glib-networking libhandy ];

--- a/pkgs/applications/editors/gnome-inform7/default.nix
+++ b/pkgs/applications/editors/gnome-inform7/default.nix
@ -23,10 +23,10 @@ let
      docbook2x
      docbook-xsl-nons
      wrapGAppsHook
+      gobject-introspection
    ];
    buildInputs = [
      gtk3
-      gobject-introspection
      vala gtk-doc
    ];
  });
@ -50,10 +50,10 @@ let
      python3
      glib
      wrapGAppsHook
+      gobject-introspection
    ];
    buildInputs = [
      gtk3
-      gobject-introspection
      vala
      gtk-doc
      gst_all_1.gstreamer
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@ -1055,9 +1055,8 @@ self: super: {
      svedbackend = stdenv.mkDerivation {
        name = "svedbackend-${super.sved.name}";
        inherit (super.sved) src;
-        nativeBuildInputs = [ wrapGAppsHook ];
+        nativeBuildInputs = [ wrapGAppsHook gobject-introspection ];
        buildInputs = [
-          gobject-introspection
          glib
          (python3.withPackages (ps: with ps; [ pygobject3 pynvim dbus-python ]))
        ];
--- a/pkgs/applications/file-managers/portfolio-filemanager/default.nix
+++ b/pkgs/applications/file-managers/portfolio-filemanager/default.nix
@ -49,7 +49,6 @@ python3.pkgs.buildPythonApplication rec {
  buildInputs = [
    glib
    gtk3
-    gobject-introspection
    libhandy
    librsvg
  ];
--- a/pkgs/applications/graphics/komikku/default.nix
+++ b/pkgs/applications/graphics/komikku/default.nix
@ -47,7 +47,6 @@ python3.pkgs.buildPythonApplication rec {
    libadwaita
    libnotify
    webkitgtk_6_0
-    gobject-introspection
  ];

  propagatedBuildInputs = with python3.pkgs; [
--- a/pkgs/applications/graphics/ocrfeeder/default.nix
+++ b/pkgs/applications/graphics/ocrfeeder/default.nix
@ -31,11 +31,11 @@ stdenv.mkDerivation rec {
    intltool
    itstool
    libxml2
+    gobject-introspection
  ];

  buildInputs = [
    gtk3
-    gobject-introspection
    goocanvas2
    gtkspell3
    isocodes
--- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix
+++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix
@ -26,6 +26,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
  nativeBuildInputs = [
    file
    intltool
+    gobject-introspection
  ];

  # Package has no generally usable unit tests.
@ -37,13 +38,9 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
    $out/bin/rapid-photo-downloader --detailed-version
  '';

-  # NOTE: Without gobject-introspection in buildInputs and strictDeps = false,
-  #       launching fails with:
-  #       "Namespace [Notify / GExiv2 / GUdev] not available"
  buildInputs = [
    gdk-pixbuf
    gexiv2
-    gobject-introspection
    gst_all_1.gst-libav
    gst_all_1.gst-plugins-base
    gst_all_1.gst-plugins-good
@ -54,6 +51,10 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
    udisks
  ];

+  # NOTE: Check if strictDeps can be renabled
+  # at the time of writing this the dependency easygui fails to build
+  #       launching fails with:
+  #       "Namespace [Notify / GExiv2 / GUdev] not available"
  strictDeps = false;

  propagatedBuildInputs = with python3Packages; [
--- a/pkgs/applications/misc/auto-multiple-choice/default.nix
+++ b/pkgs/applications/misc/auto-multiple-choice/default.nix
@ -99,6 +99,7 @@ stdenv.mkDerivation (finalAttrs: rec {
    pkg-config
    makeWrapper
    wrapGAppsHook
+    gobject-introspection
  ];

  buildInputs = [
@ -106,7 +107,6 @@ stdenv.mkDerivation (finalAttrs: rec {
    cairo.dev
    dblatex
    gnumake
-    gobject-introspection
    graphicsmagick
    gsettings-desktop-schemas
    gtk3
--- a/pkgs/applications/misc/caerbannog/default.nix
+++ b/pkgs/applications/misc/caerbannog/default.nix
@ -38,7 +38,6 @@ python3.pkgs.buildPythonApplication rec {
  buildInputs = [
    gtk3
    atk
-    gobject-introspection
    libhandy
    libnotify
    pango
--- a/pkgs/applications/misc/cobang/default.nix
+++ b/pkgs/applications/misc/cobang/default.nix
@ -59,8 +59,6 @@ buildPythonApplication rec {
  buildInputs = [
    atk
    gdk-pixbuf
-    # Needed to detect namespaces
-    gobject-introspection
    gst-plugins-good
    libhandy
    networkmanager
--- a/pkgs/applications/misc/confy/default.nix
+++ b/pkgs/applications/misc/confy/default.nix
@ -29,10 +29,10 @@ stdenv.mkDerivation rec {
    ninja
    pkg-config
    wrapGAppsHook
+    gobject-introspection
  ];

  buildInputs = [
-    gobject-introspection
    gtk3
    libhandy
    libnotify
--- a/pkgs/applications/misc/dialect/default.nix
+++ b/pkgs/applications/misc/dialect/default.nix
@ -45,7 +45,6 @@ python3.pkgs.buildPythonApplication rec {
  buildInputs = [
    gtk4
    glib
-    gobject-introspection
    gst_all_1.gstreamer
    gst_all_1.gst-plugins-base
    libsoup_3
--- a/pkgs/applications/misc/gramps/default.nix
+++ b/pkgs/applications/misc/gramps/default.nix
@ -12,8 +12,8 @@ in buildPythonApplication rec {
  version = "5.1.4";
  pname = "gramps";

-  nativeBuildInputs = [ wrapGAppsHook intltool gettext ];
-  buildInputs = [ gtk3 gobject-introspection pango gexiv2 ]
+  nativeBuildInputs = [ wrapGAppsHook intltool gettext gobject-introspection ];
+  buildInputs = [ gtk3 pango gexiv2 ]
    # Map support
    ++ lib.optionals enableOSM [ osm-gps-map glib-networking ]
    # Graphviz support
--- a/pkgs/applications/misc/markets/default.nix
+++ b/pkgs/applications/misc/markets/default.nix
@ -17,10 +17,10 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [
    desktop-file-utils glib gtk3 meson ninja pkg-config python3 vala
-    wrapGAppsHook
+    wrapGAppsHook gobject-introspection
  ];
  buildInputs = [
-    glib glib-networking gobject-introspection gtk3 json-glib libgee libhandy
+    glib glib-networking gtk3 json-glib libgee libhandy
    libsoup
  ];

--- a/pkgs/applications/misc/nwg-drawer/default.nix
+++ b/pkgs/applications/misc/nwg-drawer/default.nix
@ -22,8 +22,8 @@ buildGoModule rec {

  vendorHash = "sha256-RehZ86XuFs1kbm9V3cgPz1SPG3izK7/6fHQjPTHOYZs=";

-  buildInputs = [ cairo gobject-introspection gtk3 gtk-layer-shell ];
-  nativeBuildInputs = [ pkg-config wrapGAppsHook ];
+  buildInputs = [ cairo gtk3 gtk-layer-shell ];
+  nativeBuildInputs = [ pkg-config wrapGAppsHook gobject-introspection ];

  doCheck = false;

--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@ -33,6 +33,7 @@ let
        pkg-config
        wrapGAppsHook
        wrapPython
+        gobject-introspection
      ];

      configureFlags = [
@ -47,7 +48,6 @@ let
      ];

      buildInputs = [
-        gobject-introspection
        gtk3
        python
      ] ++ lib.optional  withRandr        libxcb
--- a/pkgs/applications/misc/shipments/default.nix
+++ b/pkgs/applications/misc/shipments/default.nix
@ -27,10 +27,10 @@ stdenv.mkDerivation rec {
    ninja
    pkg-config
    wrapGAppsHook
+    gobject-introspection
  ];

  buildInputs = [
-    gobject-introspection
    gtk3
    libhandy
    (python3.withPackages (ps: with ps; [
--- a/pkgs/applications/misc/siglo/default.nix
+++ b/pkgs/applications/misc/siglo/default.nix
@ -40,12 +40,12 @@ stdenv.mkDerivation rec {
    python3
    desktop-file-utils
    gtk3
+    gobject-introspection
  ];

  buildInputs = [
    gtk3
    python3.pkgs.gatt
-    gobject-introspection
  ];

  pythonPath = with python3.pkgs; [
--- a/pkgs/applications/misc/skytemple/default.nix
+++ b/pkgs/applications/misc/skytemple/default.nix
@ -20,7 +20,6 @@ python3Packages.buildPythonApplication rec {
  };

  buildInputs = [
-    gobject-introspection
    gtk3
    gtksourceview4
    # webkitgkt is used for rendering interactive statistics graph which
--- a/pkgs/applications/misc/sticky/default.nix
+++ b/pkgs/applications/misc/sticky/default.nix
@ -33,7 +33,6 @@ python3.pkgs.buildPythonApplication rec {

  buildInputs = [
    glib
-    gobject-introspection
    cinnamon.xapp
    gspell
  ];
--- a/pkgs/applications/misc/swaysettings/default.nix
+++ b/pkgs/applications/misc/swaysettings/default.nix
@ -46,13 +46,13 @@ stdenv.mkDerivation rec {
    python3
    vala
    wrapGAppsHook
+    gobject-introspection
  ];

  buildInputs = [
    accountsservice
    dbus
    glib
-    gobject-introspection
    gsettings-desktop-schemas
    gtk-layer-shell
    gtk3
--- a/pkgs/applications/misc/tuhi/default.nix
+++ b/pkgs/applications/misc/tuhi/default.nix
@ -34,9 +34,10 @@ python3Packages.buildPythonApplication rec {
    pkg-config meson ninja
    appstream-glib desktop-file-utils
    wrapGAppsHook
+    gobject-introspection
  ];
  buildInputs = [
-    gtk3 gobject-introspection
+    gtk3
    glib
  ];
  nativeCheckInputs = with python3Packages; [ flake8 pytest ];
--- a/pkgs/applications/misc/variety/default.nix
+++ b/pkgs/applications/misc/variety/default.nix
@ -38,7 +38,6 @@ python3.pkgs.buildPythonApplication rec {

  buildInputs = [
    gexiv2
-    gobject-introspection
    gtk3
    hicolor-icon-theme
    libnotify
--- a/pkgs/applications/misc/workrave/default.nix
+++ b/pkgs/applications/misc/workrave/default.nix
@ -55,6 +55,7 @@ stdenv.mkDerivation rec {
    pkg-config
    wrapGAppsHook
    jinja2
+    gobject-introspection
  ];

  buildInputs = [
@ -62,7 +63,6 @@ stdenv.mkDerivation rec {
    libSM
    libXScrnSaver
    libXtst
-    gobject-introspection
    glib
    glibmm
    gtkmm3
--- a/pkgs/applications/networking/browsers/eolie/default.nix
+++ b/pkgs/applications/networking/browsers/eolie/default.nix
@ -28,7 +28,6 @@ python3.pkgs.buildPythonApplication rec {

  buildInputs = with gst_all_1; [
    glib-networking
-    gobject-introspection
    gst-libav
    gst-plugins-base
    gst-plugins-ugly
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@ -46,11 +46,11 @@ stdenv.mkDerivation rec {
    pkg-config
    wrapGAppsHook
    gettext
+    gobject-introspection
  ];

  buildInputs = [
    qrencode
-    gobject-introspection
    glib
    glib-networking # required for TLS support
    libadwaita
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec {
  format = "pyproject";

  buildInputs = [
-    gobject-introspection gtk3 gnome.adwaita-icon-theme
+    gtk3 gnome.adwaita-icon-theme
    gtksourceview4
    glib-networking
  ] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-good libnice ]
@ -41,7 +41,7 @@ python3.pkgs.buildPythonApplication rec {
    ++ lib.optional enableAppIndicator libappindicator-gtk3;

  nativeBuildInputs = [
-    gettext wrapGAppsHook
+    gettext wrapGAppsHook gobject-introspection
  ];

  dontWrapGApps = true;
--- a/pkgs/applications/networking/instant-messengers/gotktrix/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gotktrix/default.nix
@ -23,10 +23,9 @@ buildGoModule rec {
  buildInputs = [
    gtk4
    glib
-    gobject-introspection
  ];

-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [ pkg-config gobject-introspection ];

  # Checking requires a working display
  doCheck = false;
--- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix
@ -78,12 +78,11 @@ with mikutterPaths; stdenv.mkDerivation rec {
    sha256 = "05253nz4i1lmnq6czj48qdab2ny4vx2mznj6nsn2l1m2z6zqkwk3";
  };

-  nativeBuildInputs = [ copyDesktopItems wrapGAppsHook ]
+  nativeBuildInputs = [ copyDesktopItems wrapGAppsHook gobject-introspection ]
    ++ lib.optionals stdenv.isDarwin [ libicns ];
  buildInputs = [
    atk
    gtk2
-    gobject-introspection
    libnotify
    which # some plugins use it at runtime
    wrappedRuby
--- a/pkgs/applications/networking/mailreaders/mailnag/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix
@ -41,13 +41,13 @@ python3Packages.buildPythonApplication rec {
    gst_all_1.gst-plugins-base
    gst_all_1.gst-plugins-good
    gst_all_1.gst-plugins-bad
-    gobject-introspection
    libsecret
  ] ++ pluginsDeps;

  nativeBuildInputs = [
    gettext
    wrapGAppsHook
+    gobject-introspection
    # To later add plugins to
    xorg.lndir
  ];
--- a/pkgs/applications/networking/mailreaders/mailnag/goa-plugin.nix
+++ b/pkgs/applications/networking/mailreaders/mailnag/goa-plugin.nix
@ -16,8 +16,11 @@ python3Packages.buildPythonPackage rec {
    sha256 = "0bij6cy96nhq7xzslx0fnhmiac629h0x4wgy67k4i4npwqw10680";
  };

-  buildInputs = [
+  nativeBuildInputs = [
    gobject-introspection
+  ];
+
+  buildInputs = [
    gnome-online-accounts
  ];

--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@ -36,6 +36,7 @@ stdenv.mkDerivation rec {
    python3Packages.wrapPython
    intltool
    pkg-config
+    gobject-introspection
  ];

  buildInputs = [
@ -49,7 +50,6 @@ stdenv.mkDerivation rec {
    libpeas
    gsettings-desktop-schemas
    json-glib
-    gobject-introspection
    libsecret
    glib-networking
    libnotify
--- a/pkgs/applications/office/bookworm/default.nix
+++ b/pkgs/applications/office/bookworm/default.nix
@ -44,13 +44,13 @@ stdenv.mkDerivation rec {
    pkg-config
    vala
    wrapGAppsHook
+    gobject-introspection
  ];

  buildInputs = [
    appstream
    desktop-file-utils
    glib
-    gobject-introspection
    gtk3
    html2text
    libgee
--- a/pkgs/applications/office/foliate/default.nix
+++ b/pkgs/applications/office/foliate/default.nix
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-Pr2YA2MHXD4W7lyCxGAVLKyoZarZ8t92RSkWle3LNuc=";
  };

-  nativeBuildInputs = [ meson ninja python3 wrapGAppsHook ];
+  nativeBuildInputs = [ meson ninja python3 wrapGAppsHook gobject-introspection ];

  postPatch = ''
    patchShebangs build-aux/meson/postinstall.py
@ -32,7 +32,6 @@ stdenv.mkDerivation rec {
    gtk3
    webkitgtk
    desktop-file-utils
-    gobject-introspection
    gsettings-desktop-schemas
  ];

--- a/pkgs/applications/video/entangle/default.nix
+++ b/pkgs/applications/video/entangle/default.nix
@ -70,6 +70,7 @@ stdenv.mkDerivation rec {
    python3 # for build scripts
    pkgconf
    wrapGAppsHook
+    gobject-introspection
  ];

  buildInputs = [
@ -79,7 +80,6 @@ stdenv.mkDerivation rec {
    elfutils
    gexiv2
    glib
-    gobject-introspection
    gst-plugins-base
    gstreamer
    gtk3
--- a/pkgs/applications/video/flowblade/default.nix
+++ b/pkgs/applications/video/flowblade/default.nix
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
  };

  buildInputs = [
-    ffmpeg frei0r sox gtk3 gobject-introspection ladspaPlugins
+    ffmpeg frei0r sox gtk3 ladspaPlugins
    (python3.withPackages (ps: with ps; [ mlt pygobject3 dbus-python numpy pillow ]))
  ];

--- a/pkgs/applications/video/recapp/default.nix
+++ b/pkgs/applications/video/recapp/default.nix
@ -44,12 +44,12 @@ python3.pkgs.buildPythonApplication rec {
    ninja
    pkg-config
    wrapGAppsHook
+    gobject-introspection
  ];

  buildInputs = [
    libnotify
    librsvg
-    gobject-introspection
    gtk3
    gst_all_1.gst-plugins-base
    gst_all_1.gst-plugins-good
--- a/pkgs/applications/video/xplayer/default.nix
+++ b/pkgs/applications/video/xplayer/default.nix
@ -67,13 +67,13 @@ stdenv.mkDerivation rec {
    itstool
    pkg-config
    yelp-tools
+    gobject-introspection
  ];

  buildInputs = [
    clutter-gst
    clutter-gtk
    glib
-    gobject-introspection
    gst-plugins-bad
    gst-plugins-base
    gst-plugins-good
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@ -52,6 +52,7 @@ stdenv.mkDerivation rec {
    xmlto docbook_xml_dtd_45
    docbook_xsl findXMLCatalogs
    asciidoctor
+    gobject-introspection
  ];

  outputs = [ "out" "doc" ];
@ -59,7 +60,7 @@ stdenv.mkDerivation rec {
  FONTCONFIG_FILE = toString fontsConf;

  propagatedUserEnvPkgs = [ hicolor-icon-theme ];
-  buildInputs = [ cairo librsvg dbus gdk-pixbuf gobject-introspection
+  buildInputs = [ cairo librsvg dbus gdk-pixbuf
                  git luaEnv libpthreadstubs libstartup_notification
                  libxdg_basedir lua nettools pango xcb-util-cursor
                  xorg.libXau xorg.libXdmcp xorg.libxcb xorg.libxshmfence
--- a/pkgs/applications/window-managers/i3/pystatus.nix
+++ b/pkgs/applications/window-managers/i3/pystatus.nix
@ -19,7 +19,11 @@ python3Packages.buildPythonApplication rec {
    sha256 = "18ygvkl92yr69kxsym57k1mc90asdxpz4b943i61qr0s4fc5n4mq";
  };

-  buildInputs = [ libpulseaudio libnotify gobject-introspection ];
+  nativeBuildInputs = [
+    gobject-introspection
+  ];
+
+  buildInputs = [ libpulseaudio libnotify ];

  propagatedBuildInputs = with python3Packages; [
    keyring colour netifaces psutil basiciw pygobject3
--- a/pkgs/build-support/rust/default-crate-overrides.nix
+++ b/pkgs/build-support/rust/default-crate-overrides.nix
@ -193,8 +193,8 @@ in
  };

  graphene-sys = attrs: {
-    nativeBuildInputs = [ pkg-config ];
-    buildInputs = [ graphene gobject-introspection ];
+    nativeBuildInputs = [ pkg-config gobject-introspection ];
+    buildInputs = [ graphene ];
  };

  nettle-sys = attrs: {
--- a/pkgs/desktops/cinnamon/bulky/default.nix
+++ b/pkgs/desktops/cinnamon/bulky/default.nix
@ -26,11 +26,11 @@ stdenv.mkDerivation rec {
    wrapGAppsHook
    gsettings-desktop-schemas
    gettext
+    gobject-introspection
  ];

  buildInputs = [
    (python3.withPackages (p: with p; [ pygobject3 magic setproctitle ]))
-    gobject-introspection
    gsettings-desktop-schemas
    gtk3
    glib
--- a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix
@ -41,7 +41,6 @@ stdenv.mkDerivation rec {
    xorg.libxkbfile
    xorg.libXext
    xorg.libXrandr
-    gobject-introspection
  ];

  nativeBuildInputs = [
@ -51,6 +50,7 @@ stdenv.mkDerivation rec {
    wrapGAppsHook
    intltool
    pkg-config
+    gobject-introspection
  ];

  postPatch = ''
--- a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix
@ -22,7 +22,6 @@ stdenv.mkDerivation rec {

  buildInputs = [
    glib
-    gobject-introspection
  ];

  nativeBuildInputs = [
@ -30,6 +29,7 @@ stdenv.mkDerivation rec {
    ninja
    wrapGAppsHook
    pkg-config
+    gobject-introspection
  ];

  meta = with lib; {
--- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix
@ -48,11 +48,11 @@ stdenv.mkDerivation rec {
    libtool
    meson
    ninja
+    gobject-introspection
  ];

  buildInputs = [
    # from meson.build
-    gobject-introspection
    gtk3
    glib

--- a/pkgs/desktops/cinnamon/cjs/default.nix
+++ b/pkgs/desktops/cinnamon/cjs/default.nix
@ -33,10 +33,10 @@ stdenv.mkDerivation rec {
    pkg-config
    which # for locale detection
    libxml2 # for xml-stripblanks
+    gobject-introspection
  ];

  buildInputs = [
-    gobject-introspection
    cairo
    readline
    spidermonkey_102
--- a/pkgs/desktops/cinnamon/muffin/default.nix
+++ b/pkgs/desktops/cinnamon/muffin/default.nix
@ -62,6 +62,7 @@ stdenv.mkDerivation rec {
    python3
    wrapGAppsHook
    xorgserver # for cvt command
+    gobject-introspection
  ];

  buildInputs = [
@ -69,7 +70,6 @@ stdenv.mkDerivation rec {
    cinnamon-desktop
    dbus
    glib
-    gobject-introspection
    gtk3
    libcanberra
    libdrm
--- a/pkgs/desktops/cinnamon/nemo/default.nix
+++ b/pkgs/desktops/cinnamon/nemo/default.nix
@ -49,7 +49,6 @@ stdenv.mkDerivation rec {
    libexif
    exempi
    gvfs
-    gobject-introspection
    libgsf
  ];

@ -60,6 +59,7 @@ stdenv.mkDerivation rec {
    wrapGAppsHook
    intltool
    shared-mime-info
+    gobject-introspection
  ];

  mesonFlags = [
--- a/pkgs/desktops/cinnamon/xapp/default.nix
+++ b/pkgs/desktops/cinnamon/xapp/default.nix
@ -44,10 +44,10 @@ stdenv.mkDerivation rec {
    python3
    vala
    wrapGAppsHook
+    gobject-introspection
  ];

  buildInputs = [
-    gobject-introspection
    (python3.withPackages (ps: with ps; [
      pygobject3
      setproctitle # mate applet
--- a/pkgs/desktops/deepin/go-package/go-gir-generator/default.nix
+++ b/pkgs/desktops/deepin/go-package/go-gir-generator/default.nix
@ -21,11 +21,11 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [
    pkg-config
    go
+    gobject-introspection
  ];

  buildInputs = [
    libgudev
-    gobject-introspection
  ];

  makeFlags = [
--- a/pkgs/desktops/gnome/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome/apps/gnome-music/default.nix
@ -58,7 +58,6 @@ python3.pkgs.buildPythonApplication rec {
    glib
    libmediaart
    gnome-online-accounts
-    gobject-introspection
    gdk-pixbuf
    python3
    grilo
--- a/pkgs/desktops/gnome/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix
@ -120,6 +120,7 @@ stdenv.mkDerivation rec {
    desktop-file-utils
    libxslt.bin
    asciidoc
+    gobject-introspection
  ];

  buildInputs = [
@ -153,7 +154,6 @@ stdenv.mkDerivation rec {
    ibus
    gnome-desktop
    gnome-settings-daemon
-    gobject-introspection
    mesa

    # recording
--- a/pkgs/desktops/gnome/core/mutter/43/default.nix
+++ b/pkgs/desktops/gnome/core/mutter/43/default.nix
@ -102,6 +102,7 @@ stdenv.mkDerivation (finalAttrs: {
    wrapGAppsHook
    gi-docgen
    xorgserver
+    gobject-introspection
  ];

  buildInputs = [
@ -110,7 +111,6 @@ stdenv.mkDerivation (finalAttrs: {
    glib
    gnome-desktop
    gnome-settings-daemon
-    gobject-introspection
    gsettings-desktop-schemas
    gtk3
    libcanberra
--- a/pkgs/desktops/gnome/core/mutter/default.nix
+++ b/pkgs/desktops/gnome/core/mutter/default.nix
@ -108,6 +108,7 @@ stdenv.mkDerivation (finalAttrs: {
    wrapGAppsHook4
    gi-docgen
    xorgserver
+    gobject-introspection
  ];

  buildInputs = [
@ -116,7 +117,6 @@ stdenv.mkDerivation (finalAttrs: {
    glib
    gnome-desktop
    gnome-settings-daemon
-    gobject-introspection
    gsettings-desktop-schemas
    atk
    fribidi
--- a/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix
+++ b/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix
@ -32,7 +32,6 @@ buildPythonApplication rec {

  buildInputs = [
    gnome.gnome-shell
-    gobject-introspection # for Gio typelib
  ];

  pythonPath = [
--- a/pkgs/development/libraries/aravis/default.nix
+++ b/pkgs/development/libraries/aravis/default.nix
@ -45,10 +45,11 @@ stdenv.mkDerivation rec {
    ninja
    pkg-config
    gi-docgen
+    gobject-introspection
  ] ++ lib.optional enableViewer wrapGAppsHook;

  buildInputs =
-    [ glib libxml2 gobject-introspection ]
+    [ glib libxml2 ]
    ++ lib.optional enableUsb libusb1
    ++ lib.optionals (enableViewer || enableGstPlugin) (with gst_all_1; [ gstreamer gst-plugins-base (gst-plugins-good.override { gtkSupport = true; }) gst-plugins-bad ])
    ++ lib.optionals (enableViewer) [ gtk3 ];
--- a/pkgs/development/libraries/arrow-glib/default.nix
+++ b/pkgs/development/libraries/arrow-glib/default.nix
@ -18,12 +18,12 @@ stdenv.mkDerivation rec {
    meson
    ninja
    pkg-config
+    gobject-introspection
  ];

  buildInputs = [
    arrow-cpp
    glib
-    gobject-introspection
  ];

  meta = with lib; {
--- a/pkgs/development/libraries/geis/default.nix
+++ b/pkgs/development/libraries/geis/default.nix
@ -32,8 +32,8 @@ stdenv.mkDerivation rec {
  pythonPath = with python3Packages;
    [ pygobject3  ];

-  nativeBuildInputs = [ pkg-config wrapGAppsHook python3Packages.wrapPython];
-  buildInputs = [ atk dbus evemu frame gdk-pixbuf gobject-introspection grail
+  nativeBuildInputs = [ pkg-config wrapGAppsHook python3Packages.wrapPython gobject-introspection ];
+  buildInputs = [ atk dbus evemu frame gdk-pixbuf grail
    gtk3 xorg.libX11 xorg.libXext xorg.libXi xorg.libXtst pango python3Packages.python xorgserver
  ];

--- a/pkgs/development/libraries/geoclue/default.nix
+++ b/pkgs/development/libraries/geoclue/default.nix
@ -65,7 +65,6 @@ stdenv.mkDerivation rec {
    json-glib
    libsoup_3
    avahi
-    gobject-introspection
  ] ++ lib.optionals withDemoAgent [
    libnotify gdk-pixbuf
  ] ++ lib.optionals (!stdenv.isDarwin) [
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@ -142,7 +142,6 @@ stdenv.mkDerivation rec {
  ];

  buildInputs = [
-    gobject-introspection
    gst-plugins-base
    orc
    json-glib
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@ -77,7 +77,6 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  buildInputs = [
-    gobject-introspection
    graphene
    orc
    libtheora
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@ -64,7 +64,6 @@ stdenv.mkDerivation (finalAttrs: {

  buildInputs = [
    bash-completion
-    gobject-introspection
  ] ++ lib.optionals stdenv.isLinux [
    libcap
    libunwind
--- a/pkgs/development/libraries/gstreamer/devtools/default.nix
+++ b/pkgs/development/libraries/gstreamer/devtools/default.nix
@ -46,7 +46,6 @@ stdenv.mkDerivation rec {
    cairo
    python3
    json-glib
-    gobject-introspection
  ];

  propagatedBuildInputs = [
--- a/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/pkgs/development/libraries/gstreamer/ges/default.nix
@ -45,7 +45,6 @@ stdenv.mkDerivation rec {
  buildInputs = [
    bash-completion
    libxml2
-    gobject-introspection
    gst-devtools
    python3
  ];
--- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
+++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
@ -41,7 +41,6 @@ stdenv.mkDerivation rec {
  buildInputs = [
    gst-plugins-base
    gst-plugins-bad
-    gobject-introspection
  ];

  mesonFlags = [
--- a/pkgs/development/libraries/keybinder/default.nix
+++ b/pkgs/development/libraries/keybinder/default.nix
@ -13,11 +13,11 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-elL6DZtzCwAtoyGZYP0jAma6tHPks2KAtrziWtBENGU=";
  };

-  nativeBuildInputs = [ pkg-config autoconf automake ];
+  nativeBuildInputs = [ pkg-config autoconf automake gobject-introspection ];

  buildInputs = [
    libtool gnome.gnome-common gtk-doc gtk2
-    lua gobject-introspection
+    lua
  ];

  configureFlags = [ "--disable-python" ];
--- a/pkgs/development/libraries/lasso/default.nix
+++ b/pkgs/development/libraries/lasso/default.nix
@ -27,11 +27,11 @@ stdenv.mkDerivation rec {
    autoreconfHook
    pkg-config
    python3
+    gobject-introspection
  ];

  buildInputs = [
    glib
-    gobject-introspection
    gtk-doc
    libtool
    libxml2
--- a/pkgs/development/libraries/liblangtag/default.nix
+++ b/pkgs/development/libraries/liblangtag/default.nix
@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
      (stdenv.hostPlatform.libc == "glibc")
      "--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias";

-  buildInputs = [ gettext glib libxml2 gobject-introspection gnome-common ];
-  nativeBuildInputs = [ autoreconfHook gtk-doc gettext pkg-config unzip ];
+  buildInputs = [ gettext glib libxml2 gnome-common ];
+  nativeBuildInputs = [ autoreconfHook gtk-doc gettext pkg-config unzip gobject-introspection ];

  meta = with lib; {
    description = "An interface library to access tags for identifying languages";
--- a/pkgs/development/libraries/libmx/default.nix
+++ b/pkgs/development/libraries/libmx/default.nix
@ -33,10 +33,9 @@ stdenv.mkDerivation rec {

  configureScript = "sh autogen.sh";

-  nativeBuildInputs = [ pkg-config automake autoconf intltool ];
+  nativeBuildInputs = [ pkg-config automake autoconf intltool gobject-introspection ];
  buildInputs = [
    libtool
-    gobject-introspection glib
    gtk2 gtk-doc clutter clutter-gtk
  ];

--- a/pkgs/development/libraries/libunique/3.x.nix
+++ b/pkgs/development/libraries/libunique/3.x.nix
@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
    sha256 = "0f70lkw66v9cj72q0iw1s2546r6bwwcd8idcm3621fg2fgh2rw58";
  };

-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ dbus dbus-glib gtk3 gobject-introspection gtk-doc docbook_xml_dtd_45 docbook_xsl libxslt libxml2 ];
+  nativeBuildInputs = [ pkg-config gobject-introspection ];
+  buildInputs = [ dbus dbus-glib gtk3 gtk-doc docbook_xml_dtd_45 docbook_xsl libxslt libxml2 ];

  meta = {
    homepage = "https://wiki.gnome.org/Attic/LibUnique";
--- a/pkgs/development/libraries/osm-gps-map/default.nix
+++ b/pkgs/development/libraries/osm-gps-map/default.nix
@ -11,10 +11,10 @@ stdenv.mkDerivation rec {

  outputs = [ "out" "dev" "doc" ];

-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [ pkg-config gobject-introspection ];

  buildInputs = [
-    cairo glib gobject-introspection
+    cairo glib
    gnome.gnome-common gtk3 gnome.libsoup
  ];

--- a/pkgs/development/python-modules/gaphas/default.nix
+++ b/pkgs/development/python-modules/gaphas/default.nix
@ -24,10 +24,10 @@ buildPythonPackage rec {

  nativeBuildInputs = [
    poetry-core
+    gobject-introspection
  ];

  buildInputs = [
-    gobject-introspection
    gtk3
  ];

--- a/pkgs/development/python-modules/gtimelog/default.nix
+++ b/pkgs/development/python-modules/gtimelog/default.nix
@ -15,9 +15,9 @@ buildPythonPackage rec {
    sha256 = "0qv2kv7vc3qqlzxsisgg31cmrkkqgnmxspbj10c5fhdmwzzwi0i9";
  };

-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper gobject-introspection ];
  buildInputs = [
-    glibcLocales gobject-introspection gtk3 libsoup libsecret
+    glibcLocales gtk3 libsoup libsecret
  ];

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@ -121,6 +121,8 @@ buildPythonPackage rec {
    setuptools
    setuptools-scm
    numpy
+  ] ++ lib.optionals enableGtk3 [
+    gobject-introspection
  ];

  buildInputs = [
@ -131,7 +133,6 @@ buildPythonPackage rec {
    ghostscript
  ] ++ lib.optionals enableGtk3 [
    cairo
-    gobject-introspection
    gtk3
  ] ++ lib.optionals enableTk [
    libX11
--- a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix
+++ b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix
@ -25,7 +25,7 @@ buildPythonPackage rec {
    hash = "sha256-/LBz0PCQI3QOAmOZk6Jynqi/+NN0w8gbY/S3YckRZ68=";
  };

-  buildInputs = [ gobject-introspection gtk3 gtksourceview4 ];
+  buildInputs = [ gtk3 gtksourceview4 ];
  nativeBuildInputs = [ gobject-introspection wrapGAppsHook ];
  propagatedBuildInputs = [
    nest-asyncio
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@ -239,9 +239,9 @@ in
  };

  gio2 = attrs: {
-    nativeBuildInputs = [ pkg-config ]
+    nativeBuildInputs = [ pkg-config gobject-introspection ]
      ++ lib.optionals stdenv.isDarwin [ DarwinTools ];
-    buildInputs = [ gtk2 pcre pcre2 gobject-introspection ] ++ lib.optionals stdenv.isLinux [ util-linux libselinux libsepol ];
+    buildInputs = [ gtk2 pcre pcre2 ] ++ lib.optionals stdenv.isLinux [ util-linux libselinux libsepol ];
  };

  gitlab-markup = attrs: { meta.priority = 1; };
--- a/pkgs/games/gscrabble/default.nix
+++ b/pkgs/games/gscrabble/default.nix
@ -15,11 +15,11 @@ buildPythonApplication {

  doCheck = false;

-  nativeBuildInputs = [ wrapGAppsHook ];
+  nativeBuildInputs = [ wrapGAppsHook gobject-introspection ];

  buildInputs = with gst_all_1; [
    gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad
-    gnome.adwaita-icon-theme gtk3 gobject-introspection
+    gnome.adwaita-icon-theme gtk3
  ];

  propagatedBuildInputs = with python3Packages; [ gst-python pygobject3 ];
--- a/pkgs/games/gshogi/default.nix
+++ b/pkgs/games/gshogi/default.nix
@ -21,10 +21,9 @@ python3.pkgs.buildPythonApplication rec {

  buildInputs = [
    gtk3
-    gobject-introspection
  ];

-  nativeBuildInputs = [ wrapGAppsHook ];
+  nativeBuildInputs = [ wrapGAppsHook gobject-introspection ];

  propagatedBuildInputs = with python3.pkgs; [
    pygobject3
--- a/pkgs/games/jumpnbump/default.nix
+++ b/pkgs/games/jumpnbump/default.nix
@ -27,8 +27,8 @@ stdenv.mkDerivation rec {

  makeFlags = [ "PREFIX=$(out)" ];

-  nativeBuildInputs = [ python3Packages.wrapPython wrapGAppsHook ];
-  buildInputs = [ SDL2 SDL2_mixer SDL2_net gtk3 gobject-introspection ];
+  nativeBuildInputs = [ python3Packages.wrapPython wrapGAppsHook gobject-introspection ];
+  buildInputs = [ SDL2 SDL2_mixer SDL2_net gtk3 ];

  postInstall = ''
    make -C menu PREFIX=$out all install
--- a/pkgs/games/minecraft/default.nix
+++ b/pkgs/games/minecraft/default.nix
@ -100,8 +100,7 @@ stdenv.mkDerivation rec {
    sha256 = "0w8z21ml79kblv20wh5lz037g130pxkgs8ll9s3bi94zn2pbrhim";
  };

-  nativeBuildInputs = [ makeWrapper wrapGAppsHook copyDesktopItems ];
-  buildInputs = [ gobject-introspection ];
+  nativeBuildInputs = [ makeWrapper wrapGAppsHook copyDesktopItems gobject-introspection ];

  sourceRoot = ".";

--- a/pkgs/os-specific/linux/tiscamera/default.nix
+++ b/pkgs/os-specific/linux/tiscamera/default.nix
@ -60,6 +60,7 @@ stdenv.mkDerivation rec {
    cmake
    pkg-config
    wrapGAppsHook
+    gobject-introspection
  ] ++ lib.optionals withDoc [
    sphinx
    graphviz
@ -81,7 +82,6 @@ stdenv.mkDerivation rec {
    pcre
    zstd
    glib
-    gobject-introspection
    gst_all_1.gstreamer
    gst_all_1.gst-plugins-base
    gst_all_1.gst-plugins-good
--- a/pkgs/servers/imgproxy/default.nix
+++ b/pkgs/servers/imgproxy/default.nix
@ -14,9 +14,9 @@ buildGoModule rec {

  vendorHash = "sha256-5o1i88v+1UGYXP2SzyM6seyidrj1Z3Q64w/gi07xf4w=";

-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [ pkg-config gobject-introspection ];

-  buildInputs = [ gobject-introspection vips ]
+  buildInputs = [ vips ]
    ++ lib.optionals stdenv.isDarwin [ libunwind ];

  preBuild = ''
--- a/pkgs/tools/audio/headset-charge-indicator/default.nix
+++ b/pkgs/tools/audio/headset-charge-indicator/default.nix
@ -14,13 +14,12 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-eaAbqeFY+B3CcKJywC3vaRsWZNQENTbALc7L7uW0W6U=";
  };

-  nativeBuildInputs = [ wrapGAppsHook ];
+  nativeBuildInputs = [ wrapGAppsHook gobject-introspection ];

  buildInputs = [
    (python3.withPackages (ps: with ps; [ pygobject3 ]))
    headsetcontrol
    gtk3
-    gobject-introspection
    libayatana-appindicator
  ];

--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix
@ -45,7 +45,6 @@ stdenv.mkDerivation rec {
    gtk3
    gtk4
    fmt
-    gobject-introspection
    fcitx5
    pcre
    libuuid
@ -64,6 +63,7 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [
    cmake
    extra-cmake-modules
+    gobject-introspection
  ];

  meta = with lib; {
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@ -131,6 +131,7 @@ stdenv.mkDerivation rec {
    vala
    wrapGAppsHook
    dbus-launch
+    gobject-introspection
  ];

  propagatedBuildInputs = [
@ -142,7 +143,6 @@ stdenv.mkDerivation rec {
    systemd
    dconf
    gdk-pixbuf
-    gobject-introspection
    python3.pkgs.pygobject3 # for pygobject overrides
    gtk2
    gtk3
--- a/pkgs/tools/misc/clipster/default.nix
+++ b/pkgs/tools/misc/clipster/default.nix
@ -14,7 +14,8 @@ stdenv.mkDerivation  rec {

  pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]);

-  buildInputs =  [ pythonEnv gtk3 libwnck gobject-introspection wrapGAppsHook ];
+  nativeBuildInputs = [ gobject-introspection ];
+  buildInputs =  [ pythonEnv gtk3 libwnck wrapGAppsHook ];

  installPhase = ''
    sed -i 's/python/python3/g' clipster
--- a/pkgs/tools/misc/ldmtool/default.nix
+++ b/pkgs/tools/misc/ldmtool/default.nix
@ -31,9 +31,9 @@ stdenv.mkDerivation rec {

  configureScript = "sh autogen.sh";

-  nativeBuildInputs = [ pkg-config autoconf automake ];
+  nativeBuildInputs = [ pkg-config autoconf automake gobject-introspection ];
  buildInputs = [ gtk-doc lvm2 libxslt.bin
-    libtool readline gobject-introspection json-glib libuuid
+    libtool readline json-glib libuuid
  ];

  meta = with lib; {
--- a/pkgs/tools/misc/rmlint/default.nix
+++ b/pkgs/tools/misc/rmlint/default.nix
@ -42,6 +42,7 @@ stdenv.mkDerivation rec {
  ] ++ lib.optionals withGui [
    makeWrapper
    wrapGAppsHook
+    gobject-introspection
  ];

  buildInputs = [
@ -51,7 +52,6 @@ stdenv.mkDerivation rec {
    util-linux
  ] ++ lib.optionals withGui [
    cairo
-    gobject-introspection
    gtksourceview3
    pango
    polkit
--- a/pkgs/tools/misc/system-config-printer/default.nix
+++ b/pkgs/tools/misc/system-config-printer/default.nix
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
  buildInputs = [
    glib udev libusb1 cups
    python3Packages.python
-    libnotify gobject-introspection gdk-pixbuf pango atk packagekit
+    libnotify gdk-pixbuf pango atk packagekit
    libsecret
  ];

@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
    intltool pkg-config
    xmlto libxml2 docbook_xml_dtd_412 docbook_xsl desktop-file-utils
    python3Packages.wrapPython
-    wrapGAppsHook autoreconfHook
+    wrapGAppsHook autoreconfHook gobject-introspection
  ];

  pythonPath = with python3Packages; requiredPythonModules [ pycups pycurl dbus-python pygobject3 requests pycairo pysmbc ];
--- a/pkgs/tools/networking/networkmanager/default.nix
+++ b/pkgs/tools/networking/networkmanager/default.nix
@ -128,7 +128,6 @@ stdenv.mkDerivation rec {
  ];

  buildInputs = [
-    gobject-introspection
    systemd
    libselinux
    audit
--- a/pkgs/tools/networking/networkmanager/dmenu/default.nix
+++ b/pkgs/tools/networking/networkmanager/dmenu/default.nix
@ -13,7 +13,8 @@ in stdenv.mkDerivation rec {
    sha256 = "sha256-cJeDYk2BQv2ZWGC96I7lXFFYgseWj68ZfvE7ATW46U0=";
  };

-  buildInputs = [ glib python pygobject3 gobject-introspection networkmanager python3Packages.wrapPython ];
+  nativeBuildInputs = [ gobject-introspection ];
+  buildInputs = [ glib python pygobject3 networkmanager python3Packages.wrapPython ];

  dontBuild = true;

--- a/pkgs/tools/networking/whatip/default.nix
+++ b/pkgs/tools/networking/whatip/default.nix
@ -37,6 +37,7 @@ python3.pkgs.buildPythonApplication rec {
    wrapGAppsHook4
    appstream-glib
    desktop-file-utils
+    gobject-introspection
  ];

  buildInputs = [
@ -44,7 +45,6 @@ python3.pkgs.buildPythonApplication rec {
    gtk4
    librsvg
    libadwaita
-    gobject-introspection
  ];

  propagatedBuildInputs = with python3.pkgs; [
--- a/pkgs/tools/security/gencfsm/default.nix
+++ b/pkgs/tools/security/gencfsm/default.nix
@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
    pkg-config
    vala
    wrapGAppsHook
+    gobject-introspection
  ];
  buildInputs = [
    glib
@ -29,7 +30,6 @@ stdenv.mkDerivation rec {
    libgee
    xorg.libSM
    xorg.libICE
-    gobject-introspection
    libsecret
  ];

--- a/pkgs/tools/system/gkraken/default.nix
+++ b/pkgs/tools/system/gkraken/default.nix
@ -42,7 +42,6 @@ python3Packages.buildPythonApplication rec {
  ];

  buildInputs = [
-    gobject-introspection
    glib
    gtk3
    libnotify
--- a/pkgs/tools/text/textpieces/default.nix
+++ b/pkgs/tools/text/textpieces/default.nix
@ -44,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
    wrapGAppsHook4
    appstream-glib
    desktop-file-utils
+    gobject-introspection
  ];

  buildInputs = [
@ -54,7 +55,6 @@ stdenv.mkDerivation (finalAttrs: {
    libgee
    json-glib
    gtksourceview5
-    gobject-introspection
  ];

  runtimeDependencies = [