From 63d46aaac49a7d439ee33a4526b3470d88c9b3b1 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 10 Oct 2024 12:40:46 +0200 Subject: [PATCH] dconf: fix building without emulation available MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For example, Linux → FreeBSD. --- pkgs/development/libraries/dconf/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dconf/default.nix b/pkgs/development/libraries/dconf/default.nix index 1aad769c6db2..6d56ba075f49 100644 --- a/pkgs/development/libraries/dconf/default.nix +++ b/pkgs/development/libraries/dconf/default.nix @@ -15,7 +15,10 @@ , docbook-xsl-nons , docbook_xml_dtd_42 , nixosTests -, withDocs ? true +, buildPackages +, gobject-introspection +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages +, withDocs ? withIntrospection }: stdenv.mkDerivation rec { @@ -49,12 +52,14 @@ stdenv.mkDerivation rec { glib bash-completion dbus + ] ++ lib.optionals withIntrospection [ vala ]; mesonFlags = [ "--sysconfdir=/etc" - "-Dgtk_doc=${lib.boolToString withDocs}" + (lib.mesonBool "gtk_doc" withDocs) + (lib.mesonBool "vapi" withIntrospection) ]; nativeCheckInputs = [