Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

locate: does not use localuser for mlocate

(cherry picked from commit 6ef6484dd645a7d1d6b1d3d993988ba5833a5701)

authored by romildo and committed by Bjørn Forsman 0065ae23 65aed1df

Changed files
+1 -1
nixos
modules
misc
+1 -1
nixos/modules/misc/locate.nix
··· 133 133 '' 134 134 mkdir -m 0755 -p ${dirOf cfg.output} 135 135 exec ${cfg.locate}/bin/updatedb \ 136 - ${optionalString (cfg.localuser != null) ''--localuser=${cfg.localuser}''} \ 136 + ${optionalString (cfg.localuser != null && ! isMLocate) ''--localuser=${cfg.localuser}''} \ 137 137 --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags} 138 138 ''; 139 139 environment = {