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

Allow overrides to work for unit options

Browse Source
This commit is contained in:
Eelco Dolstra 2013-11-18 15:51:21 +01:00
parent 33cb0bbb4b
commit 8951be2d80
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/system/boot/systemd-unit-options.nix
View File

@ -17,11 +17,13 @@ let
unitOption = mkOptionType { unitOption = mkOptionType {
name = "systemd option"; name = "systemd option";
merge = loc: defs: merge = loc: defs:
let defs' = getValues defs; let
defs' = filterOverrides defs;
defs'' = getValues defs';
in in
if isList (head defs') if isList (head defs'')
then concatLists defs' then concatLists defs''
else mergeOneOption loc defs; else mergeOneOption loc defs';
}; };
in rec { in rec {