Skip to content

Commit bacbc16

Browse files
committed
Rename innards of nglib.mkOptionsEqual to make it resemble upstream
Signed-off-by: magic_rb <magic_rb@redalder.org>
1 parent b87051a commit bacbc16

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

lib/options.nix

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,21 @@
3838
getOptionFromPath' [ ] path options;
3939

4040
mkOptionsEqual =
41-
primaryPath: secondaryPath:
41+
to: from:
4242
{ config, options, ... }:
4343
let
44-
secondaryOption = nglib.getOptionFromPath secondaryPath options;
45-
primaryOption = nglib.getOptionFromPath primaryPath options;
44+
fromOpt = nglib.getOptionFromPath from options;
45+
toOpt = nglib.getOptionFromPath to options;
4646

47-
prio = secondaryOption.highestPrio or lib.defaultOverridePriority;
48-
defsWithPrio = map (lib.mkOverride prio) secondaryOption.definitions;
47+
prio = fromOpt.highestPrio or lib.defaultOverridePriority;
48+
defsWithPrio = map (lib.mkOverride prio) fromOpt.definitions;
4949
in
5050
{
51-
config = lib.attrsets.setAttrByPath primaryPath (
52-
lib.mkMerge defsWithPrio
51+
config = lib.attrsets.setAttrByPath to (
52+
lib.mkMerge defsWithPrio
5353
);
54-
options = lib.attrsets.setAttrByPath secondaryPath (
55-
lib.mkOption { apply = x: lib.attrsets.getAttrFromPath primaryPath config; }
54+
options = lib.attrsets.setAttrByPath from (
55+
lib.mkOption { apply = x: lib.attrsets.getAttrFromPath to config; }
5656
);
5757
};
5858
}

0 commit comments

Comments
 (0)