diff options
author | K900 <me@0upti.me> | 2023-10-02 15:10:22 +0300 |
---|---|---|
committer | K900 <me@0upti.me> | 2023-10-02 15:10:22 +0300 |
commit | 524181b5b817b1d2aac2693a6058558679555450 (patch) | |
tree | 74f6c376365fcaef3560775e9b39b244585cde26 /pkgs | |
parent | 061e2b87d39e76993c4a33629825fdc5ceaec436 (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 'pkgs')
-rw-r--r-- | pkgs/tools/misc/mlocate/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/misc/plocate/default.nix | 6 |
2 files changed, 2 insertions, 9 deletions
diff --git a/pkgs/tools/misc/mlocate/default.nix b/pkgs/tools/misc/mlocate/default.nix index b57f109eda0ad..4cc86df5a8977 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 a49ff5d183899..8b4cbcbd7ae9b 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; { |