Merge pull request #214782 from alyssais/gobject-introspection

Remove lots more obsolete gobject-introspection build inputs
2023-02-05 14:05:32 -05:00 · 2023-02-05 14:05:32 -05:00 · 3226550f0b
parent 2f063f02dc 309e4dc8b9
commit 3226550f0b
18 changed files with 2 additions and 24 deletions
--- a/pkgs/applications/misc/genxword/default.nix
+++ b/pkgs/applications/misc/genxword/default.nix
@ -26,7 +26,6 @@ python3.pkgs.buildPythonApplication rec {
  ];

  buildInputs = [
-    gobject-introspection
    pango
    gtksourceview3
  ];
--- a/pkgs/applications/misc/udiskie/default.nix
+++ b/pkgs/applications/misc/udiskie/default.nix
@ -43,7 +43,6 @@ python3.pkgs.buildPythonApplication rec {
  dontWrapGApps = true;

  buildInputs = [
-    gobject-introspection
    gtk3
    libappindicator-gtk3
    libnotify
--- a/pkgs/applications/office/autokey/default.nix
+++ b/pkgs/applications/office/autokey/default.nix
@ -25,7 +25,6 @@ python3Packages.buildPythonApplication rec {
  nativeBuildInputs = [ wrapGAppsHook gobject-introspection ];

  buildInputs = [
-    gobject-introspection
    gtksourceview3
    libappindicator-gtk3
    libnotify
--- a/pkgs/applications/terminal-emulators/terminator/default.nix
+++ b/pkgs/applications/terminal-emulators/terminator/default.nix
@ -33,7 +33,6 @@ python3.pkgs.buildPythonApplication rec {

  buildInputs = [
    gtk3
-    gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943
    keybinder3
    libnotify
    python3
--- a/pkgs/development/libraries/accountsservice/default.nix
+++ b/pkgs/development/libraries/accountsservice/default.nix
@ -62,8 +62,8 @@ stdenv.mkDerivation rec {
  ];

  buildInputs = [
-    gobject-introspection
    dbus
+    gettext
    glib
    polkit
    systemd
--- a/pkgs/development/libraries/gjs/default.nix
+++ b/pkgs/development/libraries/gjs/default.nix
@ -27,7 +27,6 @@

 let
  testDeps = [
-    gobject-introspection # for Gio and cairo typelibs
    gtk3 atk pango.out gdk-pixbuf harfbuzz
  ];
 in stdenv.mkDerivation rec {
--- a/pkgs/development/libraries/libgudev/default.nix
+++ b/pkgs/development/libraries/libgudev/default.nix
@ -55,7 +55,6 @@ stdenv.mkDerivation rec {
  ];

  buildInputs = [
-    gobject-introspection
    udev
    glib
  ];
--- a/pkgs/development/libraries/libical/default.nix
+++ b/pkgs/development/libraries/libical/default.nix
@ -59,7 +59,6 @@ stdenv.mkDerivation rec {
    glib
    libxml2
    icu
-    gobject-introspection
  ];

  cmakeFlags = [
--- a/pkgs/development/libraries/libmanette/default.nix
+++ b/pkgs/development/libraries/libmanette/default.nix
@ -40,7 +40,6 @@ stdenv.mkDerivation rec {
  ];

  buildInputs = [
-    gobject-introspection
    glib
    libgudev
    libevdev
--- a/pkgs/development/libraries/libnotify/default.nix
+++ b/pkgs/development/libraries/libnotify/default.nix
@ -44,10 +44,6 @@ stdenv.mkDerivation rec {
    gobject-introspection
  ];

-  buildInputs = lib.optionals withIntrospection [
-    gobject-introspection
-  ];
-
  propagatedBuildInputs = [
    gdk-pixbuf
    glib
--- a/pkgs/development/libraries/libqrtr-glib/default.nix
+++ b/pkgs/development/libraries/libqrtr-glib/default.nix
@ -45,7 +45,6 @@ stdenv.mkDerivation rec {
  ];

  buildInputs = [
-    gobject-introspection
    glib
  ];

--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@ -71,8 +71,6 @@ stdenv.mkDerivation rec {
    bzip2
    pango
    libintl
-  ] ++ lib.optionals withIntrospection [
-    gobject-introspection
  ] ++ lib.optionals stdenv.isDarwin [
    ApplicationServices
    Foundation
--- a/pkgs/development/libraries/libsecret/default.nix
+++ b/pkgs/development/libraries/libsecret/default.nix
@ -52,7 +52,6 @@ stdenv.mkDerivation rec {

  buildInputs = [
    libgcrypt
-    gobject-introspection
  ];

  propagatedBuildInputs = [
--- a/pkgs/development/libraries/libvirt-glib/default.nix
+++ b/pkgs/development/libraries/libvirt-glib/default.nix
@ -55,8 +55,6 @@ stdenv.mkDerivation rec {
    libxml2
  ] ++ lib.optionals stdenv.isLinux [
    libcap_ng
-  ] ++ lib.optionals withIntrospection [
-    gobject-introspection
  ];

  strictDeps = true;
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@ -90,7 +90,6 @@ stdenv.mkDerivation rec {
  ];

  buildInputs = [
-    gobject-introspection
    expat
    pam
    dbus
--- a/pkgs/development/libraries/umockdev/default.nix
+++ b/pkgs/development/libraries/umockdev/default.nix
@ -48,7 +48,6 @@ stdenv.mkDerivation rec {
  ];

  buildInputs = [
-    gobject-introspection
    glib
    systemd
    libgudev
--- a/pkgs/development/python-modules/pygobject/3.nix
+++ b/pkgs/development/python-modules/pygobject/3.nix
@ -42,8 +42,7 @@ buildPythonPackage rec {
  ];

  buildInputs = [
-    # # .so files link to these
-    gobject-introspection
+    # # .so files link to this
    glib
  ] ++ lib.optionals stdenv.isDarwin [
    ncurses
--- a/pkgs/servers/gpsd/default.nix
+++ b/pkgs/servers/gpsd/default.nix
@ -59,7 +59,6 @@ stdenv.mkDerivation rec {
    atk
    dbus-glib
    gdk-pixbuf
-    gobject-introspection
    libX11
    libXaw
    libXext