diff options
| author | K900 <me@0upti.me> | 2023-10-03 08:58:20 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-03 08:58:20 +0300 |
| commit | 9d2e9d8ddf72543c3caf02fad45cc80570916704 (patch) | |
| tree | 0e1097dda5b3c28836b30ac8346c4082592624ab /nixos | |
| parent | 638d19ac92232265a6e7031878ea35a0734c8def (diff) | |
| parent | b53f817088d841966f54f867155df50b85934a33 (diff) | |
| download | nixpkgs-9d2e9d8ddf72543c3caf02fad45cc80570916704.tar nixpkgs-9d2e9d8ddf72543c3caf02fad45cc80570916704.tar.gz nixpkgs-9d2e9d8ddf72543c3caf02fad45cc80570916704.tar.bz2 nixpkgs-9d2e9d8ddf72543c3caf02fad45cc80570916704.tar.lz nixpkgs-9d2e9d8ddf72543c3caf02fad45cc80570916704.tar.xz nixpkgs-9d2e9d8ddf72543c3caf02fad45cc80570916704.tar.zst nixpkgs-9d2e9d8ddf72543c3caf02fad45cc80570916704.zip | |
Merge pull request #258434 from SuperSandro2000/locate-dbfile
nixos/locate: #258575 followup
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/misc/locate.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index b413c46c536..569d81e245c 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -6,7 +6,7 @@ let cfg = config.services.locate; isMLocate = hasPrefix "mlocate" cfg.locate.name; isPLocate = hasPrefix "plocate" cfg.locate.name; - isMorPLocate = (isMLocate || isPLocate); + isMorPLocate = isMLocate || isPLocate; isFindutils = hasPrefix "findutils" cfg.locate.name; in { @@ -216,18 +216,18 @@ in setgid = true; setuid = false; }; - mlocate = (mkIf isMLocate { + mlocate = mkIf isMLocate { group = "mlocate"; source = "${cfg.locate}/bin/locate"; - }); - plocate = (mkIf isPLocate { + }; + plocate = mkIf isPLocate { group = "plocate"; source = "${cfg.locate}/bin/plocate"; - }); + }; in mkIf isMorPLocate { locate = mkMerge [ common mlocate plocate ]; - plocate = (mkIf isPLocate (mkMerge [ common plocate ])); + plocate = mkIf isPLocate (mkMerge [ common plocate ]); }; environment.systemPackages = [ cfg.locate ]; |