diff --git a/hosts/skydick/datapool.nix b/hosts/skydick/datapool.nix index 10b9699..70880a9 100644 --- a/hosts/skydick/datapool.nix +++ b/hosts/skydick/datapool.nix @@ -177,17 +177,25 @@ { # Build sambaFull with Spotlight/tracker support. - # Upstream waf only checks tracker-sparql-{2.0,1.0,0.16,0.14}; tinysparql - # ships tracker-sparql-3.0.pc. Patch the version list and add build deps. + # 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. nixpkgs.overlays = [ (final: prev: { sambaFull = prev.sambaFull.overrideAttrs (old: { - buildInputs = old.buildInputs ++ [ final.tinysparql.dev final.glib.dev ]; + buildInputs = old.buildInputs ++ [ + final.tinysparql.dev + final.glib.dev + final.icu.dev + ]; postPatch = (old.postPatch or "") + '' 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']" ''; + NIX_CFLAGS_COMPILE = (old.NIX_CFLAGS_COMPILE or "") + " -Wno-error=deprecated-declarations"; }); }) ];