about summary refs log tree commit diff
path: root/nixos/modules/misc
diff options
context:
space:
mode:
authorvolth <volth@webmaster.ms>2018-02-22 19:44:21 +0000
committerGitHub <noreply@github.com>2018-02-22 19:44:21 +0000
commiteef641aa6d09f16844fc22645dbda7a7d0eac51f (patch)
tree0b9153c3dfd316f1a5705d4d286559a008ca3e71 /nixos/modules/misc
parent8cd9194a8008fe8250afe059d57201b34e370fcd (diff)
downloadnixlib-eef641aa6d09f16844fc22645dbda7a7d0eac51f.tar
nixlib-eef641aa6d09f16844fc22645dbda7a7d0eac51f.tar.gz
nixlib-eef641aa6d09f16844fc22645dbda7a7d0eac51f.tar.bz2
nixlib-eef641aa6d09f16844fc22645dbda7a7d0eac51f.tar.lz
nixlib-eef641aa6d09f16844fc22645dbda7a7d0eac51f.tar.xz
nixlib-eef641aa6d09f16844fc22645dbda7a7d0eac51f.tar.zst
nixlib-eef641aa6d09f16844fc22645dbda7a7d0eac51f.zip
nixos/label: no prepend '-' if there are no tags
Diffstat (limited to 'nixos/modules/misc')
-rw-r--r--nixos/modules/misc/label.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/misc/label.nix b/nixos/modules/misc/label.nix
index 250914e8f82e..8e5e57b3b83b 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) ])));
   };
 
 }