tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
nixos/locate: remove `nixpkgs.config` usage
K900
2 years ago
38461ff2
ce87196a
+4
-10
3 changed files
expand all
collapse all
unified
split
nixos
modules
misc
locate.nix
pkgs
tools
misc
mlocate
default.nix
plocate
default.nix
+1
-3
nixos/modules/misc/locate.nix
···
230
plocate = (mkIf isPLocate (mkMerge [ common plocate ]));
231
};
232
233
-
nixpkgs.config = { locate.dbfile = cfg.output; };
234
-
235
-
environment.systemPackages = [ cfg.locate ];
236
237
environment.variables = mkIf (!isMorPLocate) { LOCATE_PATH = cfg.output; };
238
···
230
plocate = (mkIf isPLocate (mkMerge [ common plocate ]));
231
};
232
233
+
environment.systemPackages = [ (cfg.locate.override { dbfile = cfg.output; }) ];
0
0
234
235
environment.variables = mkIf (!isMorPLocate) { LOCATE_PATH = cfg.output; };
236
+2
-4
pkgs/tools/misc/mlocate/default.nix
···
1
-
{ lib, stdenv, fetchurl, config }:
2
3
-
let
4
-
dbfile = lib.attrByPath [ "locate" "dbfile" ] "/var/cache/locatedb" config;
5
-
in stdenv.mkDerivation rec {
6
pname = "mlocate";
7
version = "0.26";
8
···
1
+
{ lib, stdenv, fetchurl, config, dbfile ? config.locate.dbfile or "/var/cache/locatedb" }:
2
3
+
stdenv.mkDerivation rec {
0
0
4
pname = "mlocate";
5
version = "0.26";
6
+1
-3
pkgs/tools/misc/plocate/default.nix
···
8
, systemd
9
, liburing
10
, zstd
0
11
}:
12
-
let
13
-
dbfile = lib.attrByPath [ "locate" "dbfile" ] "/var/cache/locatedb" config;
14
-
in
15
stdenv.mkDerivation rec {
16
pname = "plocate";
17
version = "1.1.19";
···
8
, systemd
9
, liburing
10
, zstd
11
+
, dbfile ? config.locate.dbfile or "/var/cache/locatedb"
12
}:
0
0
0
13
stdenv.mkDerivation rec {
14
pname = "plocate";
15
version = "1.1.19";