colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/locate: cleanup optional parenthesis

Browse Source
This commit is contained in:
Sandro Jäckel 2023-10-03 00:19:57 +02:00
parent f98a338eec
commit b53f817088
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nixos/modules/misc/locate.nix
View File

@ -6,7 +6,7 @@ let
cfg = config.services.locate; cfg = config.services.locate;
isMLocate = hasPrefix "mlocate" cfg.locate.name; isMLocate = hasPrefix "mlocate" cfg.locate.name;
isPLocate = hasPrefix "plocate" cfg.locate.name; isPLocate = hasPrefix "plocate" cfg.locate.name;
isMorPLocate = (isMLocate || isPLocate); isMorPLocate = isMLocate || isPLocate;
isFindutils = hasPrefix "findutils" cfg.locate.name; isFindutils = hasPrefix "findutils" cfg.locate.name;
in in
{ {
@ -216,18 +216,18 @@ in
setgid = true; setgid = true;
setuid = false; setuid = false;
}; };
mlocate = (mkIf isMLocate { mlocate = mkIf isMLocate {
group = "mlocate"; group = "mlocate";
source = "${cfg.locate}/bin/locate"; source = "${cfg.locate}/bin/locate";
}); };
plocate = (mkIf isPLocate { plocate = mkIf isPLocate {
group = "plocate"; group = "plocate";
source = "${cfg.locate}/bin/plocate"; source = "${cfg.locate}/bin/plocate";
}); };
in in
mkIf isMorPLocate { mkIf isMorPLocate {
locate = mkMerge [ common mlocate plocate ]; locate = mkMerge [ common mlocate plocate ];
plocate = (mkIf isPLocate (mkMerge [ common plocate ])); plocate = mkIf isPLocate (mkMerge [ common plocate ]);
}; };
environment.systemPackages = [ cfg.locate ]; environment.systemPackages = [ cfg.locate ];