From 9ce148e738b322899ae650b7eb42ee44af3f56dd Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 24 Sep 2013 09:40:06 -0400 Subject: [PATCH] Don't break compatibility with pre-1.6 nix Signed-off-by: Shea Levy --- modules/config/shells-environment.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/config/shells-environment.nix b/modules/config/shells-environment.nix index 0bb7c4e26fe..f1ce492d816 100644 --- a/modules/config/shells-environment.nix +++ b/modules/config/shells-environment.nix @@ -28,7 +28,7 @@ in merge = xs: let xs' = evalProperties xs; in if isList (head xs') then concatLists xs' - else if length xs' > 1 then abort "variable in ‘environment.variables’ has multiple values" + else if builtins.lessThan 1 (length xs') then abort "variable in ‘environment.variables’ has multiple values" else if !builtins.isString (head xs') then abort "variable in ‘environment.variables’ does not have a string value" else head xs'; });