diff options
| author | K900 <me@0upti.me> | 2023-09-26 17:54:22 +0300 |
|---|---|---|
| committer | K900 <me@0upti.me> | 2023-09-26 18:02:00 +0300 |
| commit | 38461ff27aa4b0511cf1b1f17a62d415ec88cc5c (patch) | |
| tree | 3774c3cc760fdb8f0bb7076c320f4cbf019f179c | |
| parent | ce87196a00214a0062ece1c3e03a9a97f563580f (diff) | |
nixos/locate: remove `nixpkgs.config` usage
| -rw-r--r-- | nixos/modules/misc/locate.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/misc/mlocate/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/misc/plocate/default.nix | 4 |
3 files changed, 4 insertions, 10 deletions
diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index acf441cda6288..482d12fe0ca3a 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -230,9 +230,7 @@ in plocate = (mkIf isPLocate (mkMerge [ common plocate ])); }; - nixpkgs.config = { locate.dbfile = cfg.output; }; - - environment.systemPackages = [ cfg.locate ]; + environment.systemPackages = [ (cfg.locate.override { dbfile = cfg.output; }) ]; environment.variables = mkIf (!isMorPLocate) { LOCATE_PATH = cfg.output; }; diff --git a/pkgs/tools/misc/mlocate/default.nix b/pkgs/tools/misc/mlocate/default.nix index 12d9f5622cc4a..b57f109eda0ad 100644 --- a/pkgs/tools/misc/mlocate/default.nix +++ b/pkgs/tools/misc/mlocate/default.nix @@ -1,8 +1,6 @@ -{ lib, stdenv, fetchurl, config }: +{ lib, stdenv, fetchurl, config, dbfile ? config.locate.dbfile or "/var/cache/locatedb" }: -let - dbfile = lib.attrByPath [ "locate" "dbfile" ] "/var/cache/locatedb" config; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "mlocate"; version = "0.26"; diff --git a/pkgs/tools/misc/plocate/default.nix b/pkgs/tools/misc/plocate/default.nix index 356d58ccbc35c..a49ff5d183899 100644 --- a/pkgs/tools/misc/plocate/default.nix +++ b/pkgs/tools/misc/plocate/default.nix @@ -8,10 +8,8 @@ , systemd , liburing , zstd +, dbfile ? config.locate.dbfile or "/var/cache/locatedb" }: -let - dbfile = lib.attrByPath [ "locate" "dbfile" ] "/var/cache/locatedb" config; -in stdenv.mkDerivation rec { pname = "plocate"; version = "1.1.19"; |