From cdf3c75541e0f64d932eadb62686b1d585d852ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Mon, 12 Oct 2020 19:05:38 +0200 Subject: corenix: allow setting extraFiles.*.src to null --- modules/corenix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules') diff --git a/modules/corenix/default.nix b/modules/corenix/default.nix index 94698782f62e..ff7acb1e950b 100644 --- a/modules/corenix/default.nix +++ b/modules/corenix/default.nix @@ -7,7 +7,7 @@ let fileOptions.options = { src = mkOption { - type = types.path; + type = types.nullOr types.path; }; type = mkOption { @@ -38,7 +38,7 @@ in { config = { corenix.installCommands = let - filteredFiles = filterAttrs (k: v: v != null) cfg.extraFiles; + filteredFiles = filterAttrs (k: v: v.src != null) cfg.extraFiles; filesList = mapAttrsToList (k: v: v // { name = k; }) filteredFiles; in concatMapStringsSep "\n" (file: if file.type == "payload" then '' -- cgit v1.2.3