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.
This commit is contained in:
parent
44ef6a13bf
commit
af82a43ffc
19 changed files with 19 additions and 19 deletions
|
@ -7,7 +7,7 @@
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, gobject-introspection
|
, gobject-introspection
|
||||||
, buildPackages
|
, buildPackages
|
||||||
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||||
, gsettings-desktop-schemas
|
, gsettings-desktop-schemas
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
, dbus
|
, dbus
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
, lib
|
, lib
|
||||||
, testers
|
, testers
|
||||||
, buildPackages
|
, buildPackages
|
||||||
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||||
, gobject-introspection
|
, gobject-introspection
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
, glib
|
, glib
|
||||||
, gobject-introspection
|
, gobject-introspection
|
||||||
, buildPackages
|
, buildPackages
|
||||||
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||||
, meson
|
, meson
|
||||||
, ninja
|
, ninja
|
||||||
# just for passthru
|
# just for passthru
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
, at-spi2-atk
|
, at-spi2-atk
|
||||||
, gobject-introspection
|
, gobject-introspection
|
||||||
, buildPackages
|
, buildPackages
|
||||||
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||||
, compileSchemas ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
, compileSchemas ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||||
, fribidi
|
, fribidi
|
||||||
, xorg
|
, xorg
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
, ninja
|
, ninja
|
||||||
, gobject-introspection
|
, gobject-introspection
|
||||||
, buildPackages
|
, buildPackages
|
||||||
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||||
, icu
|
, icu
|
||||||
, graphite2
|
, graphite2
|
||||||
, harfbuzz # The icu variant uses and propagates the non-icu one.
|
, harfbuzz # The icu variant uses and propagates the non-icu one.
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
, nixosTests
|
, nixosTests
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, gettext
|
, gettext
|
||||||
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||||
, buildPackages
|
, buildPackages
|
||||||
, gobject-introspection
|
, gobject-introspection
|
||||||
, gi-docgen
|
, gi-docgen
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
, vala
|
, vala
|
||||||
, gobject-introspection
|
, gobject-introspection
|
||||||
, buildPackages
|
, buildPackages
|
||||||
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||||
, gtk-doc
|
, gtk-doc
|
||||||
, docbook-xsl-nons
|
, docbook-xsl-nons
|
||||||
, docbook_xml_dtd_43
|
, docbook_xml_dtd_43
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
, bash-completion
|
, bash-completion
|
||||||
, bash
|
, bash
|
||||||
, buildPackages
|
, buildPackages
|
||||||
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||||
, withDocs ? stdenv.hostPlatform == stdenv.buildPlatform
|
, withDocs ? stdenv.hostPlatform == stdenv.buildPlatform
|
||||||
, gobject-introspection
|
, gobject-introspection
|
||||||
}:
|
}:
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
, gdk-pixbuf
|
, gdk-pixbuf
|
||||||
, gnome
|
, gnome
|
||||||
, buildPackages
|
, buildPackages
|
||||||
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||||
, gobject-introspection
|
, gobject-introspection
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
, libmbim
|
, libmbim
|
||||||
, libqrtr-glib
|
, libqrtr-glib
|
||||||
, buildPackages
|
, buildPackages
|
||||||
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||||
, withMan ? stdenv.buildPlatform.canExecute stdenv.hostPlatform
|
, withMan ? stdenv.buildPlatform.canExecute stdenv.hostPlatform
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
, gnome
|
, gnome
|
||||||
, vala
|
, vala
|
||||||
, writeScript
|
, writeScript
|
||||||
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||||
, buildPackages
|
, buildPackages
|
||||||
, gobject-introspection
|
, gobject-introspection
|
||||||
, _experimental-update-script-combinators
|
, _experimental-update-script-combinators
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
, libgcrypt
|
, libgcrypt
|
||||||
, gobject-introspection
|
, gobject-introspection
|
||||||
, buildPackages
|
, buildPackages
|
||||||
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||||
, vala
|
, vala
|
||||||
, gi-docgen
|
, gi-docgen
|
||||||
, gnome
|
, gnome
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
, glib-networking
|
, glib-networking
|
||||||
, buildPackages
|
, buildPackages
|
||||||
, gobject-introspection
|
, gobject-introspection
|
||||||
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||||
, vala
|
, vala
|
||||||
, libpsl
|
, libpsl
|
||||||
, python3
|
, python3
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
, sqlite
|
, sqlite
|
||||||
, glib-networking
|
, glib-networking
|
||||||
, buildPackages
|
, buildPackages
|
||||||
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
, libvirt
|
, libvirt
|
||||||
, libxml2
|
, libxml2
|
||||||
, buildPackages
|
, buildPackages
|
||||||
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||||
, gobject-introspection
|
, gobject-introspection
|
||||||
, withDocs ? stdenv.hostPlatform == stdenv.buildPlatform
|
, withDocs ? stdenv.hostPlatform == stdenv.buildPlatform
|
||||||
, gtk-doc
|
, gtk-doc
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
, glib
|
, glib
|
||||||
, python3
|
, python3
|
||||||
, x11Support? !stdenv.isDarwin, libXft
|
, x11Support? !stdenv.isDarwin, libXft
|
||||||
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||||
, buildPackages, gobject-introspection
|
, buildPackages, gobject-introspection
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
, systemdMinimal
|
, systemdMinimal
|
||||||
, elogind
|
, elogind
|
||||||
, buildPackages
|
, buildPackages
|
||||||
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||||
# A few tests currently fail on musl (polkitunixusertest, polkitunixgrouptest, polkitidentitytest segfault).
|
# A few tests currently fail on musl (polkitunixusertest, polkitunixgrouptest, polkitidentitytest segfault).
|
||||||
# Not yet investigated; it may be due to the "Make netgroup support optional"
|
# Not yet investigated; it may be due to the "Make netgroup support optional"
|
||||||
# patch not updating the tests correctly yet, or doing something wrong,
|
# patch not updating the tests correctly yet, or doing something wrong,
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
, asciidoc
|
, asciidoc
|
||||||
, gobject-introspection
|
, gobject-introspection
|
||||||
, buildPackages
|
, buildPackages
|
||||||
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||||
, vala
|
, vala
|
||||||
, python3
|
, python3
|
||||||
, gi-docgen
|
, gi-docgen
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
, libimobiledevice
|
, libimobiledevice
|
||||||
, withDocs ? withIntrospection
|
, withDocs ? withIntrospection
|
||||||
, mesonEmulatorHook
|
, mesonEmulatorHook
|
||||||
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
|
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||||
, buildPackages
|
, buildPackages
|
||||||
, gobject-introspection
|
, gobject-introspection
|
||||||
}:
|
}:
|
||||||
|
|
Loading…
Reference in a new issue