about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorK900 <me@0upti.me>2023-10-02 15:10:22 +0300
committerK900 <me@0upti.me>2023-10-02 15:10:22 +0300
commit524181b5b817b1d2aac2693a6058558679555450 (patch)
tree74f6c376365fcaef3560775e9b39b244585cde26 /nixos
parent061e2b87d39e76993c4a33629825fdc5ceaec436 (diff)
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.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/misc/locate.nix4
1 files changed, 2 insertions, 2 deletions
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`