From 8951be2d805cfb03b98900530a0bdb64146111a0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 18 Nov 2013 15:51:21 +0100 Subject: [PATCH] Allow overrides to work for unit options --- nixos/modules/system/boot/systemd-unit-options.nix | 10 ++++++---- 1 file 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 d30a80a6f06..4eb3f1a43a6 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 {