From 5d230261c9a4f282b6e841dca1e77b16b9cf7e12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 3 Oct 2023 00:10:39 +0200
Subject: [PATCH 1/3] mlocate: fix default dbfile location after #258575

---
 pkgs/tools/misc/mlocate/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/mlocate/default.nix b/pkgs/tools/misc/mlocate/default.nix
index 4cc86df5a897..c9253be930af 100644
--- a/pkgs/tools/misc/mlocate/default.nix
+++ b/pkgs/tools/misc/mlocate/default.nix
@@ -5,10 +5,14 @@ stdenv.mkDerivation rec {
   version = "0.26";
 
   src = fetchurl {
-    url = "https://releases.pagure.org/mlocate/${pname}-${version}.tar.xz";
+    url = "https://releases.pagure.org/mlocate/mlocate-${version}.tar.xz";
     sha256 = "0gi6y52gkakhhlnzy0p6izc36nqhyfx5830qirhvk3qrzrwxyqrh";
   };
 
+  makeFlags = [
+    "dbfile=/var/cache/locatedb"
+  ];
+
   meta = with lib; {
     description = "Merging locate is an utility to index and quickly search for files";
     homepage = "https://pagure.io/mlocate";

From f98a338eec41e707d16003fec9fb3f7be33f550b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 3 Oct 2023 00:13:09 +0200
Subject: [PATCH 2/3] plocate: fix default dbfile location after #258575

---
 pkgs/tools/misc/plocate/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/misc/plocate/default.nix b/pkgs/tools/misc/plocate/default.nix
index 8b4cbcbd7ae9..2a55841d7e53 100644
--- a/pkgs/tools/misc/plocate/default.nix
+++ b/pkgs/tools/misc/plocate/default.nix
@@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
 
   mesonFlags = [
     "-Dsystemunitdir=${placeholder "out"}/etc/systemd/system"
+    "-Dsharedstatedir=/var/cache"
+    "-Ddbpath=locatedb"
   ];
 
   meta = with lib; {

From b53f817088d841966f54f867155df50b85934a33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 3 Oct 2023 00:19:57 +0200
Subject: [PATCH 3/3] nixos/locate: cleanup optional parenthesis

---
 nixos/modules/misc/locate.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix
index b413c46c5365..569d81e245c2 100644
--- a/nixos/modules/misc/locate.nix
+++ b/nixos/modules/misc/locate.nix
@@ -6,7 +6,7 @@ let
   cfg = config.services.locate;
   isMLocate = hasPrefix "mlocate" cfg.locate.name;
   isPLocate = hasPrefix "plocate" cfg.locate.name;
-  isMorPLocate = (isMLocate || isPLocate);
+  isMorPLocate = isMLocate || isPLocate;
   isFindutils = hasPrefix "findutils" cfg.locate.name;
 in
 {
@@ -216,18 +216,18 @@ in
           setgid = true;
           setuid = false;
         };
-        mlocate = (mkIf isMLocate {
+        mlocate = mkIf isMLocate {
           group = "mlocate";
           source = "${cfg.locate}/bin/locate";
-        });
-        plocate = (mkIf isPLocate {
+        };
+        plocate = mkIf isPLocate {
           group = "plocate";
           source = "${cfg.locate}/bin/plocate";
-        });
+        };
       in
       mkIf isMorPLocate {
         locate = mkMerge [ common mlocate plocate ];
-        plocate = (mkIf isPLocate (mkMerge [ common plocate ]));
+        plocate = mkIf isPLocate (mkMerge [ common plocate ]);
       };
 
     environment.systemPackages = [ cfg.locate ];