From eef641aa6d09f16844fc22645dbda7a7d0eac51f Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 22 Feb 2018 19:44:21 +0000 Subject: nixos/label: no prepend '-' if there are no tags --- nixos/modules/misc/label.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nixos') diff --git a/nixos/modules/misc/label.nix b/nixos/modules/misc/label.nix index 250914e8f82e1..8e5e57b3b83b7 100644 --- a/nixos/modules/misc/label.nix +++ b/nixos/modules/misc/label.nix @@ -65,8 +65,8 @@ in # This is set here rather than up there so that changing it would # not rebuild the manual system.nixos.label = mkDefault (maybeEnv "NIXOS_LABEL" - (concatStringsSep "-" (sort (x: y: x < y) cfg.tags) - + "-" + maybeEnv "NIXOS_LABEL_VERSION" cfg.version)); + (concatStringsSep "-" ((sort (x: y: x < y) cfg.tags) + ++ [ (maybeEnv "NIXOS_LABEL_VERSION" cfg.version) ]))); }; } -- cgit 1.4.1