Unverified Commit af82a43f authored Oct 12, 2023 by Alyssa Ross

treewide: disable gobject-introspection when unavailable

This makes gsettings-desktop-schemas, harfbuzz, json-glib, and
libsecret buildable statically, and is still the right thing to do
everywhere else even where it's not a complete fix.

parent 44ef6a13

pkgs/development/libraries/at-spi2-core/default.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@
		, pkg-config
		, gobject-introspection
		, buildPackages
		, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
		, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
		, gsettings-desktop-schemas
		, makeWrapper
		, dbus

pkgs/development/libraries/gdk-pixbuf/default.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@
		, lib
		, testers
		, buildPackages
		, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
		, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
		, gobject-introspection
		}:

pkgs/development/libraries/gsettings-desktop-schemas/default.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@
		, glib
		, gobject-introspection
		, buildPackages
		, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
		, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
		, meson
		, ninja
		# just for passthru

pkgs/development/libraries/gtk/3.x.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@
		, at-spi2-atk
		, gobject-introspection
		, buildPackages
		, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
		, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
		, compileSchemas ? stdenv.hostPlatform.emulatorAvailable buildPackages
		, fribidi
		, xorg

pkgs/development/libraries/harfbuzz/default.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@
		, ninja
		, gobject-introspection
		, buildPackages
		, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
		, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
		, icu
		, graphite2
		, harfbuzz # The icu variant uses and propagates the non-icu one.