From f8fa83ff137e5d56d8defb0c47f0a48831104064 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Sat, 8 Jan 2022 17:59:14 -0800 Subject: [PATCH] tracker: Unconditionally add checkInputs to nativeBuildInputs `gi` is required by the main `meson.build` and checked at the start of the build process, regardless of whether tests are enabled or not. As a result, builds are broken when `doCheck = false`. Also removing tappy which is no longer needed: https://gitlab.gnome.org/GNOME/tracker/-/merge_requests/385 --- pkgs/development/libraries/tracker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index 7dbe0d410f75..3e20d8483fbf 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -61,7 +61,8 @@ stdenv.mkDerivation rec { python3 # for data-generators systemd # used for checks to install systemd user service dbus # used for checks and pkg-config to install dbus service/s - ]; + ] ++ checkInputs; # gi is in the main meson.build and checked regardless of + # whether tests are enabled buildInputs = [ glib @@ -77,7 +78,6 @@ stdenv.mkDerivation rec { checkInputs = with python3.pkgs; [ pygobject3 - tappy ]; mesonFlags = [