diff --git a/hosts/skydick/datapool.nix b/hosts/skydick/datapool.nix index 781e833..a868f52 100644 --- a/hosts/skydick/datapool.nix +++ b/hosts/skydick/datapool.nix @@ -179,7 +179,8 @@ # Build sambaFull with Spotlight/tracker support. # Fixes for tinysparql 3.x (tracker-sparql-3.0) compatibility: # (1) waf only checks tracker-sparql-{2.0..0.14} — add 3.0 - # (2) async-tracker.c uses removed API names — patch to new names + # (2) tevent_glib_tracker test uses removed tracker 2.x API — disable it + # (it's install=False, for_selftest only; rpcd_mdssvc is unaffected) # (3) add icu for Unicode normalisation required by Spotlight nixpkgs.overlays = [ (final: prev: { @@ -193,11 +194,9 @@ substituteInPlace source3/wscript \ --replace-fail "tracker_versions = ['2.0', '1.0', '0.16', '0.14']" \ "tracker_versions = ['3.0', '2.0', '1.0', '0.16', '0.14']" - substituteInPlace source3/utils/async-tracker.c \ - --replace-fail "tracker_sparql_connection_get_finish" \ - "tracker_sparql_connection_new_finish" \ - --replace-fail "tracker_sparql_connection_get_async" \ - "tracker_sparql_connection_new_async" + substituteInPlace source3/wscript_build \ + --replace-fail "enabled=bld.CONFIG_SET('HAVE_TRACKER') and bld.CONFIG_SET('WITH_TEVENT_GLIB_GLUE')" \ + "enabled=False" ''; }); })