b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

at-spi2-core: re-disable introspection if no emulator

Browse source 
e.g. when cross compiling from Linux to FreeBSD.

Fixes: e31262c3ee ("at-spi2-core: make introspection unconditional")
This commit is contained in:
Alyssa Ross 2023-02-06 15:28:47 +00:00
parent 7c643c3312
commit 8ea1ca271b
No known key found for this signature in database
GPG key ID: F9DBED4859B271C0
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/development/libraries/at-spi2-core/default.nix
View file

@ -5,6 +5,8 @@
, ninja , ninja
, pkg-config , pkg-config
, gobject-introspection , gobject-introspection
, buildPackages
, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages
, gsettings-desktop-schemas , gsettings-desktop-schemas
, makeWrapper , makeWrapper
, dbus , dbus
@ -30,11 +32,13 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ nativeBuildInputs = [
glib
meson meson
ninja ninja
pkg-config pkg-config
gobject-introspection
makeWrapper makeWrapper
] ++ lib.optionals withIntrospection [
gobject-introspection
]; ];
buildInputs = [ buildInputs = [
@ -58,7 +62,6 @@ stdenv.mkDerivation rec {
doCheck = false; doCheck = false;
mesonFlags = [ mesonFlags = [
"-Dintrospection=yes"
# Provide dbus-daemon fallback when it is not already running when # Provide dbus-daemon fallback when it is not already running when
# at-spi2-bus-launcher is executed. This allows us to avoid # at-spi2-bus-launcher is executed. This allows us to avoid
# including the entire dbus closure in libraries linked with # including the entire dbus closure in libraries linked with