forked from mirrors/nixpkgs
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.
This commit is contained in:
parent
061e2b87d3
commit
524181b5b8
|
@ -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`
|
||||
|
|
|
@ -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";
|
||||
|
|
|
@ -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; {
|
||||
|
|
Loading…
Reference in a new issue