Don't break compatibility with pre-1.6 nix

Signed-off-by: Shea Levy <shea@shealevy.com>
This commit is contained in:
Shea Levy 2013-09-24 09:40:06 -04:00
parent ec2266b2e2
commit 9ce148e738

View File

@ -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';
});