From 524181b5b817b1d2aac2693a6058558679555450 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 2 Oct 2023 15:10:22 +0300 Subject: nixos/locate: rip out dbfile overrides All the locate versions we have support LOCATE_PATH, so just use that instead of adding indirections all over the place AND forcing people to rebuild their locate implementation if they want the path changed. --- nixos/modules/misc/locate.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nixos') diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index 482d12fe0ca3a..b413c46c53655 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -230,9 +230,9 @@ in plocate = (mkIf isPLocate (mkMerge [ common plocate ])); }; - environment.systemPackages = [ (cfg.locate.override { dbfile = cfg.output; }) ]; + environment.systemPackages = [ cfg.locate ]; - environment.variables = mkIf (!isMorPLocate) { LOCATE_PATH = cfg.output; }; + environment.variables.LOCATE_PATH = cfg.output; environment.etc = { # write /etc/updatedb.conf for manual calls to `updatedb` -- cgit 1.4.1