From e1bd8afb0794c0af1b35bcd623e0d9e88cf845b4 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 6 Feb 2023 20:33:43 +0000 Subject: [PATCH] libsoup: re-disable introspection if no emulator e.g. when cross compiling from Linux to FreeBSD. Fixes: 1bd8727a4ca ("various: enable gobject-introspection when cross-compiling") --- pkgs/development/libraries/libsoup/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 05bf4b15523..df9ce5c5b6e 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -15,6 +15,8 @@ , gnomeSupport ? true , sqlite , glib-networking +, buildPackages +, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages }: stdenv.mkDerivation rec { @@ -37,6 +39,7 @@ stdenv.mkDerivation rec { ninja pkg-config glib + ] ++ lib.optionals withIntrospection [ gobject-introspection vala ]; @@ -58,6 +61,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dtls_check=false" # glib-networking is a runtime dependency, not a compile-time dependency "-Dgssapi=disabled" + "-Dvapi=${if withIntrospection then "enabled" else "disabled"}" + "-Dintrospection=${if withIntrospection then "enabled" else "disabled"}" "-Dgnome=${lib.boolToString gnomeSupport}" "-Dntlm=disabled" ] ++ lib.optionals (!stdenv.isLinux) [