From 20642e2ab0c278f1e51ca2e63ec0836f91b5451d Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 12 Jul 2022 15:17:11 +0300 Subject: [PATCH] various: readd gobject-introspection to buildInputs see eb829035c938022bb064faef56a7b1346443e034 --- pkgs/development/libraries/atk/default.nix | 2 ++ pkgs/development/libraries/gdk-pixbuf/default.nix | 2 ++ pkgs/development/libraries/geoclue/default.nix | 1 + pkgs/development/libraries/gstreamer/bad/default.nix | 1 + pkgs/development/libraries/gstreamer/base/default.nix | 1 + pkgs/development/libraries/gstreamer/core/default.nix | 1 + pkgs/development/libraries/gstreamer/devtools/default.nix | 1 + pkgs/development/libraries/gstreamer/ges/default.nix | 1 + pkgs/development/libraries/gstreamer/rtsp-server/default.nix | 1 + pkgs/development/libraries/gtk/3.x.nix | 1 + pkgs/development/libraries/harfbuzz/default.nix | 2 +- pkgs/development/libraries/json-glib/default.nix | 2 ++ pkgs/development/libraries/libgudev/default.nix | 1 + pkgs/development/libraries/libical/default.nix | 1 + pkgs/development/libraries/libmanette/default.nix | 1 + pkgs/development/libraries/libsecret/default.nix | 1 + pkgs/development/libraries/libsoup/default.nix | 1 + pkgs/development/libraries/pango/default.nix | 1 + pkgs/development/libraries/polkit/default.nix | 1 + pkgs/development/libraries/tracker/default.nix | 1 + pkgs/tools/networking/networkmanager/default.nix | 1 + 21 files changed, 24 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index 3b8c9a27d031..268bf43eb3e8 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -39,6 +39,8 @@ stdenv.mkDerivation rec { fixDarwinDylibNames ]; + buildInputs = [ gobject-introspection ]; + propagatedBuildInputs = [ # Required by atk.pc glib diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 93fb05a13b60..ff8ace9613fc 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -66,6 +66,8 @@ stdenv.mkDerivation rec { fixDarwinDylibNames ]; + buildInputs = [ gobject-introspection ]; + propagatedBuildInputs = [ glib libtiff diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index f3d4ce1aa7b8..7756f6169ccd 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -84,6 +84,7 @@ stdenv.mkDerivation rec { json-glib libsoup avahi + gobject-introspection ] ++ lib.optionals withDemoAgent [ libnotify gdk-pixbuf ] ++ lib.optionals (!stdenv.isDarwin) [ diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 152904a8e7a2..6d940362a21a 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -121,6 +121,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + gobject-introspection gst-plugins-base orc json-glib diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index b0aed54d9b40..c9e9c7f3248a 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -69,6 +69,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional enableWayland wayland; buildInputs = [ + gobject-introspection orc libtheora libintl diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index d867a8f04d37..662c3281b030 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -63,6 +63,7 @@ stdenv.mkDerivation rec { buildInputs = [ bash-completion + gobject-introspection ] ++ lib.optionals stdenv.isLinux [ libcap libunwind diff --git a/pkgs/development/libraries/gstreamer/devtools/default.nix b/pkgs/development/libraries/gstreamer/devtools/default.nix index 3b39fa4439ac..acb12b78341d 100644 --- a/pkgs/development/libraries/gstreamer/devtools/default.nix +++ b/pkgs/development/libraries/gstreamer/devtools/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { cairo python3 json-glib + gobject-introspection ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index fa7ea35bcdfe..9d6f3c0f4834 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { buildInputs = [ bash-completion libxml2 + gobject-introspection ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index 1a1b136b0ca2..8fe79bb7b8be 100644 --- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { buildInputs = [ gst-plugins-base gst-plugins-bad + gobject-introspection ]; mesonFlags = [ diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index b69f6164acad..c06aa9469937 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -110,6 +110,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + gobject-introspection libxkbcommon (libepoxy.override { inherit x11Support; }) isocodes diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 49dba7c65804..20323796e9de 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation { docbook_xml_dtd_43 ]; - buildInputs = [ glib freetype ] + buildInputs = [ glib freetype gobject-introspection ] ++ lib.optionals withCoreText [ ApplicationServices CoreText ]; propagatedBuildInputs = optional withGraphite2 graphite2 diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index e1676a69551d..1f8f4fd1acc0 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -43,6 +43,8 @@ stdenv.mkDerivation rec { fixDarwinDylibNames ]; + buildInputs = [ gobject-introspection ]; + propagatedBuildInputs = [ glib ]; diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix index 59df64e63558..799e1d0f8451 100644 --- a/pkgs/development/libraries/libgudev/default.nix +++ b/pkgs/development/libraries/libgudev/default.nix @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + gobject-introspection udev glib ]; diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index 435d1cc9bc02..3656d2991a82 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -59,6 +59,7 @@ stdenv.mkDerivation rec { glib libxml2 icu + gobject-introspection ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/libmanette/default.nix b/pkgs/development/libraries/libmanette/default.nix index 7629dd8a6f1a..2320aa78bba7 100644 --- a/pkgs/development/libraries/libmanette/default.nix +++ b/pkgs/development/libraries/libmanette/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + gobject-introspection glib libgudev libevdev diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index 7378d62d677f..24a34a92f3c1 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { buildInputs = [ libgcrypt + gobject-introspection ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index ea91173540ec..9976f4109f0e 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + gobject-introspection sqlite libpsl glib.out diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 16db7be31356..4f5f84702f9e 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { buildInputs = [ fribidi libthai + gobject-introspection ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Carbon diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 9fb61b1245ab..ff025fb52102 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -116,6 +116,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + gobject-introspection expat pam spidermonkey_78 diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index fe7bcbf3a543..a643fd6e4150 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -67,6 +67,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + gobject-introspection glib libxml2 sqlite diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index c170ed102872..2d4e11f5b998 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -143,6 +143,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + gobject-introspection systemd libselinux audit