Skip to content

Commit

Permalink
findutils: move {locate,updatedb} to a separate $locate output
Browse files Browse the repository at this point in the history
  • Loading branch information
Artturin committed Mar 26, 2022
1 parent 77dc421 commit c3c0444
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 3 deletions.
2 changes: 1 addition & 1 deletion nixos/modules/misc/locate.nix
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ in

locate = mkOption {
type = package;
default = pkgs.findutils;
default = pkgs.findutils.locate;
defaultText = literalExpression "pkgs.findutils";
example = literalExpression "pkgs.mlocate";
description = ''
Expand Down
19 changes: 17 additions & 2 deletions pkgs/tools/misc/findutils/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
&& (stdenv.hostPlatform.libc != "musl")
&& stdenv.hostPlatform == stdenv.buildPlatform;

outputs = [ "out" "info" ];
outputs = [ "out" "info" "locate"];

configureFlags = [
# "sort" need not be on the PATH as a run-time dep, so we need to tell
Expand All @@ -46,6 +46,18 @@ stdenv.mkDerivation rec {
"-D__nonnull\\(params\\)="
];

postInstall = ''
moveToOutput bin/locate $locate
moveToOutput bin/updatedb $locate
'';

# can't move man pages in postInstall because the multi-output hook will move them back to $out
postFixup = ''
moveToOutput share/man/man5 $locate
moveToOutput share/man/man1/locate.1.gz $locate
moveToOutput share/man/man1/updatedb.1.gz $locate
'';

enableParallelBuilding = true;

meta = {
Expand All @@ -62,9 +74,12 @@ stdenv.mkDerivation rec {
The tools supplied with this package are:
* find - search for files in a directory hierarchy;
* xargs - build and execute command lines from standard input.
The following are available in the locate output:
* locate - list files in databases that match a pattern;
* updatedb - update a file name database;
* xargs - build and execute command lines from standard input.
'';

platforms = lib.platforms.all;
Expand Down

0 comments on commit c3c0444

Please sign in to comment.