From 524181b5b817b1d2aac2693a6058558679555450 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 2 Oct 2023 15:10:22 +0300
Subject: [PATCH] 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 ++--
 pkgs/tools/misc/mlocate/default.nix | 5 +----
 pkgs/tools/misc/plocate/default.nix | 6 +-----
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix
index 482d12fe0ca..b413c46c536 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`
diff --git a/pkgs/tools/misc/mlocate/default.nix b/pkgs/tools/misc/mlocate/default.nix
index b57f109eda0..4cc86df5a89 100644
--- a/pkgs/tools/misc/mlocate/default.nix
+++ b/pkgs/tools/misc/mlocate/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, config, dbfile ? config.locate.dbfile or "/var/cache/locatedb" }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "mlocate";
@@ -9,9 +9,6 @@ stdenv.mkDerivation rec {
     sha256 = "0gi6y52gkakhhlnzy0p6izc36nqhyfx5830qirhvk3qrzrwxyqrh";
   };
 
-  buildInputs = [ ];
-  makeFlags = [ "dbfile=${dbfile}" ];
-
   meta = with lib; {
     description = "Merging locate is an utility to index and quickly search for files";
     homepage = "https://pagure.io/mlocate";
diff --git a/pkgs/tools/misc/plocate/default.nix b/pkgs/tools/misc/plocate/default.nix
index a49ff5d1838..8b4cbcbd7ae 100644
--- a/pkgs/tools/misc/plocate/default.nix
+++ b/pkgs/tools/misc/plocate/default.nix
@@ -1,5 +1,4 @@
-{ config
-, stdenv
+{ stdenv
 , lib
 , fetchgit
 , pkg-config
@@ -8,7 +7,6 @@
 , systemd
 , liburing
 , zstd
-, dbfile ? config.locate.dbfile or "/var/cache/locatedb"
 }:
 stdenv.mkDerivation rec {
   pname = "plocate";
@@ -31,8 +29,6 @@ stdenv.mkDerivation rec {
 
   mesonFlags = [
     "-Dsystemunitdir=${placeholder "out"}/etc/systemd/system"
-    "-Dsharedstatedir=${builtins.dirOf dbfile}"
-    "-Ddbpath=${builtins.baseNameOf dbfile}"
   ];
 
   meta = with lib; {