diff options
author | Shea Levy <shea@shealevy.com> | 2013-09-24 09:40:06 -0400 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2013-09-24 09:40:06 -0400 |
commit | 9ce148e738b322899ae650b7eb42ee44af3f56dd (patch) | |
tree | fc978110659402714771d57bc592850840a29c7f | |
parent | ec2266b2e24e546c13e5c100c1f777bb50bcec65 (diff) | |
download | nixlib-9ce148e738b322899ae650b7eb42ee44af3f56dd.tar nixlib-9ce148e738b322899ae650b7eb42ee44af3f56dd.tar.gz nixlib-9ce148e738b322899ae650b7eb42ee44af3f56dd.tar.bz2 nixlib-9ce148e738b322899ae650b7eb42ee44af3f56dd.tar.lz nixlib-9ce148e738b322899ae650b7eb42ee44af3f56dd.tar.xz nixlib-9ce148e738b322899ae650b7eb42ee44af3f56dd.tar.zst nixlib-9ce148e738b322899ae650b7eb42ee44af3f56dd.zip |
Don't break compatibility with pre-1.6 nix
Signed-off-by: Shea Levy <shea@shealevy.com>
-rw-r--r-- | modules/config/shells-environment.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/config/shells-environment.nix b/modules/config/shells-environment.nix index 0bb7c4e26fe5..f1ce492d8165 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'; }); |