nixos/locate: remove `nixpkgs.config` usage

K900 38461ff2 ce87196a

+4 -10
+1 -3
nixos/modules/misc/locate.nix
··· 230 230 plocate = (mkIf isPLocate (mkMerge [ common plocate ])); 231 231 }; 232 232 233 - nixpkgs.config = { locate.dbfile = cfg.output; }; 234 - 235 - environment.systemPackages = [ cfg.locate ]; 233 + environment.systemPackages = [ (cfg.locate.override { dbfile = cfg.output; }) ]; 236 234 237 235 environment.variables = mkIf (!isMorPLocate) { LOCATE_PATH = cfg.output; }; 238 236
+2 -4
pkgs/tools/misc/mlocate/default.nix
··· 1 - { lib, stdenv, fetchurl, config }: 1 + { lib, stdenv, fetchurl, config, dbfile ? config.locate.dbfile or "/var/cache/locatedb" }: 2 2 3 - let 4 - dbfile = lib.attrByPath [ "locate" "dbfile" ] "/var/cache/locatedb" config; 5 - in stdenv.mkDerivation rec { 3 + stdenv.mkDerivation rec { 6 4 pname = "mlocate"; 7 5 version = "0.26"; 8 6
+1 -3
pkgs/tools/misc/plocate/default.nix
··· 8 8 , systemd 9 9 , liburing 10 10 , zstd 11 + , dbfile ? config.locate.dbfile or "/var/cache/locatedb" 11 12 }: 12 - let 13 - dbfile = lib.attrByPath [ "locate" "dbfile" ] "/var/cache/locatedb" config; 14 - in 15 13 stdenv.mkDerivation rec { 16 14 pname = "plocate"; 17 15 version = "1.1.19";