nixos/tracker: Remove subcommandPackages option
The TRACKER_CLI_SUBCOMMANDS_DIR env is superseded by TRACKER_CLI_DIR env in https://github.com/GNOME/tinysparql/commit/d14c3bb0afb98be9e10cc5d9c05baddff5c5790e The TRACKER_CLI_DIR env is then removed in https://github.com/GNOME/tinysparql/commit/3a86e86c9d812aeeece2b7236f2e4223dcbd3d91 with the commit message "we do no longer expect this CLI to be extended by external projects". Also tracker-miners (localsearch) now provides its own cli tool: https://gitlab.gnome.org/GNOME/localsearch/-/commit/a8989f4378f1f7f82a2d6b16aa5b22f866f099ec
This commit is contained in:
@@ -37,8 +37,6 @@
|
||||
|
||||
systemd.packages = [ pkgs.tracker-miners ];
|
||||
|
||||
services.gnome.tracker.subcommandPackages = [ pkgs.tracker-miners ];
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -11,6 +11,14 @@ in
|
||||
maintainers = lib.teams.gnome.members;
|
||||
};
|
||||
|
||||
imports = [
|
||||
(lib.mkRemovedOptionModule [ "services" "gnome" "tracker" "subcommandPackages" ] ''
|
||||
This option is broken since 3.7 and since 3.8 tracker (tinysparql) no longer expect
|
||||
CLI to be extended by external projects, note that tracker-miners (localsearch) now
|
||||
provides its own CLI tool.
|
||||
'')
|
||||
];
|
||||
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
@@ -26,15 +34,6 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
subcommandPackages = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.package;
|
||||
default = [ ];
|
||||
internal = true;
|
||||
description = ''
|
||||
List of packages containing tracker3 subcommands.
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
@@ -50,17 +49,6 @@ in
|
||||
|
||||
systemd.packages = [ pkgs.tracker ];
|
||||
|
||||
environment.variables = {
|
||||
TRACKER_CLI_SUBCOMMANDS_DIR =
|
||||
let
|
||||
subcommandPackagesTree = pkgs.symlinkJoin {
|
||||
name = "tracker-with-subcommands-${pkgs.tracker.version}";
|
||||
paths = [ pkgs.tracker ] ++ cfg.subcommandPackages;
|
||||
};
|
||||
in
|
||||
"${subcommandPackagesTree}/libexec/tracker3";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user