From e1f72ee81b48a1da518a5c3093905ac62fee8872 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Mon, 4 Oct 2021 20:57:15 +0200 Subject: feedbackd: support cross-compilation Disables introspection for now. --- pkgs/applications/misc/feedbackd/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/feedbackd/default.nix b/pkgs/applications/misc/feedbackd/default.nix index 0892f2e2d02c1..3692273fdf3b6 100644 --- a/pkgs/applications/misc/feedbackd/default.nix +++ b/pkgs/applications/misc/feedbackd/default.nix @@ -32,7 +32,8 @@ stdenv.mkDerivation rec { # only a Debian package release that is tagged in the upstream repo version = "0.0.0+git20220520"; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ "out" "dev" ] + ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ]; src = fetchFromGitLab { domain = "source.puri.sm"; @@ -61,7 +62,11 @@ stdenv.mkDerivation rec { libgudev ]; - mesonFlags = [ "-Dgtk_doc=true" "-Dman=true" ]; + mesonFlags = [ + "-Dgtk_doc=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" + "-Dman=true" + "-Dintrospection=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "enabled" else "disabled"}" + ]; checkInputs = [ dbus -- cgit 1.4.1 From 322a6cc95b97cbaeefcdf14800ab936c79ff1dc1 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Fri, 3 Jun 2022 18:50:22 +0200 Subject: feedbackd: add comment explaining why introspection is disabled for cross --- pkgs/applications/misc/feedbackd/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/feedbackd/default.nix b/pkgs/applications/misc/feedbackd/default.nix index 3692273fdf3b6..2a4db6b10e471 100644 --- a/pkgs/applications/misc/feedbackd/default.nix +++ b/pkgs/applications/misc/feedbackd/default.nix @@ -65,6 +65,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" "-Dman=true" + # TODO(mindavi): introspection broken due to https://github.com/NixOS/nixpkgs/issues/72868 + # can be removed if cross-compiling gobject-introspection works. "-Dintrospection=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "enabled" else "disabled"}" ]; -- cgit 1.4.1 From 56651dbdda39919718f4d2fbe3f6b2e3bdd89207 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Wed, 8 Jun 2022 20:59:36 +0200 Subject: feedbackd: comment that optional devdoc depends on gir Co-authored-by: Sandro --- pkgs/applications/misc/feedbackd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/feedbackd/default.nix b/pkgs/applications/misc/feedbackd/default.nix index 2a4db6b10e471..ad1660173159c 100644 --- a/pkgs/applications/misc/feedbackd/default.nix +++ b/pkgs/applications/misc/feedbackd/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { version = "0.0.0+git20220520"; outputs = [ "out" "dev" ] + # remove if cross-compiling gobject-introspection works ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ]; src = fetchFromGitLab { -- cgit 1.4.1