diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-11-18 15:51:21 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-11-18 18:04:16 +0100 |
| commit | 8951be2d805cfb03b98900530a0bdb64146111a0 (patch) | |
| tree | 601716c1ce21a019ea52f4a3bb18c7ba544388e3 /nixos/modules/system/boot/systemd-unit-options.nix | |
| parent | 33cb0bbb4b18ae1c1a5762b9f9f3f46c7008d7fd (diff) | |
| download | nixlib-8951be2d805cfb03b98900530a0bdb64146111a0.tar nixlib-8951be2d805cfb03b98900530a0bdb64146111a0.tar.gz nixlib-8951be2d805cfb03b98900530a0bdb64146111a0.tar.bz2 nixlib-8951be2d805cfb03b98900530a0bdb64146111a0.tar.lz nixlib-8951be2d805cfb03b98900530a0bdb64146111a0.tar.xz nixlib-8951be2d805cfb03b98900530a0bdb64146111a0.tar.zst nixlib-8951be2d805cfb03b98900530a0bdb64146111a0.zip | |
Allow overrides to work for unit options
Diffstat (limited to 'nixos/modules/system/boot/systemd-unit-options.nix')
| -rw-r--r-- | nixos/modules/system/boot/systemd-unit-options.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index d30a80a6f06f..4eb3f1a43a65 100644 --- a/nixos/modules/system/boot/systemd-unit-options.nix +++ b/nixos/modules/system/boot/systemd-unit-options.nix @@ -17,11 +17,13 @@ let unitOption = mkOptionType { name = "systemd option"; merge = loc: defs: - let defs' = getValues defs; + let + defs' = filterOverrides defs; + defs'' = getValues defs'; in - if isList (head defs') - then concatLists defs' - else mergeOneOption loc defs; + if isList (head defs'') + then concatLists defs'' + else mergeOneOption loc defs'; }; in rec { |