diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index b413c46c536..569d81e245c 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 ]; diff --git a/pkgs/tools/misc/mlocate/default.nix b/pkgs/tools/misc/mlocate/default.nix index 4cc86df5a89..c9253be930a 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"; diff --git a/pkgs/tools/misc/plocate/default.nix b/pkgs/tools/misc/plocate/default.nix index 8b4cbcbd7ae..2a55841d7e5 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; {