diff --git a/hosts/skydick/datapool.nix b/hosts/skydick/datapool.nix index 70880a9..ca2101c 100644 --- a/hosts/skydick/datapool.nix +++ b/hosts/skydick/datapool.nix @@ -177,11 +177,10 @@ { # Build sambaFull with Spotlight/tracker support. - # Fixes: (1) upstream waf only checks tracker-sparql-{2.0..0.14} but - # tinysparql ships 3.0.pc — patch version list. - # (2) tevent_glib_tracker uses PyEval_InitThreads removed in Python 3.13 — - # suppress the deprecation error. - # (3) add icu for Unicode normalisation required by Spotlight. + # 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 + # (3) add icu for Unicode normalisation required by Spotlight nixpkgs.overlays = [ (final: prev: { sambaFull = prev.sambaFull.overrideAttrs (old: { @@ -194,8 +193,12 @@ 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" ''; - NIX_CFLAGS_COMPILE = (old.NIX_CFLAGS_COMPILE or "") + " -Wno-error=deprecated-declarations"; }); }) ];