mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-03 11:02:05 +00:00
Code Issues Wiki Activity

locate: build in correct dbpath

Browse source
This commit is contained in:
Gregor Kleen 2017-01-05 20:16:48 +01:00
parent cc1ebd1db4
commit 06211e700b
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/misc/locate.nix
View file

@ -113,8 +113,14 @@ in {
}
];
nixpkgs.config = { locate.dbfile = cfg.output; };
environment.systemPackages = [ cfg.locate ];
environment.variables = mkIf (!isMLocate)
{ LOCATE_PATH = cfg.output;
};
warnings = optional (isMLocate && cfg.localuser != null) "mlocate does not support searching as user other than root"
++ optional (isFindutils && cfg.pruneNames != []) "findutils locate does not support pruning by directory component"
++ optional (isFindutils && cfg.pruneBindMounts) "findutils locate does not support skipping bind mounts";

3
nixos/modules/programs/environment.nix
View file

@ -17,8 +17,7 @@ in
config = {
environment.variables =
{ LOCATE_PATH = "/var/cache/locatedb";
NIXPKGS_CONFIG = "/etc/nix/nixpkgs-config.nix";
{ NIXPKGS_CONFIG = "/etc/nix/nixpkgs-config.nix";
PAGER = mkDefault "less -R";
EDITOR = mkDefault "nano";
};

7
pkgs/tools/misc/mlocate/default.nix
View file

@ -1,6 +1,8 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, config }:
stdenv.mkDerivation rec {
let
dbfile = stdenv.lib.attrByPath [ "locate" "dbfile" ] "/var/cache/locatedb" config;
in stdenv.mkDerivation rec {
name = "mlocate-${version}";
version = "0.26";
@ -10,6 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ ];
makeFlags = [ "dbfile=${dbfile}" ];
meta = with stdenv.lib; {
description = "Merging locate is an utility to index and quickly search for files";