From df8c30fa25637f7ae6fe427dc6d55536707a5e92 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 9 Apr 2020 20:10:01 -0400 Subject: [PATCH] iso-image: make $ARCH shorter we use stdenv.hostPlatform.uname.processor, which I believe is just like `uname -p`. Example values: ``` (import { system = "x86_64-linux"; }).stdenv.hostPlatform.uname.processor "x86_64" (import { system = "aarch64-linux"; }).stdenv.hostPlatform.uname.processor aarch64 (import { system = "armv7l-linux"; }).stdenv.hostPlatform.uname.processor "armv7l" ``` --- nixos/modules/installer/cd-dvd/iso-image.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index b85f20bb09bc37..5243a8aa747bf0 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -427,7 +427,7 @@ in isoImage.volumeID = mkOption { # nixos-$EDITION-$RELEASE-$ARCH - default = "nixos${optionalString (config.isoImage.edition != "") "-${config.isoImage.edition}"}-${config.system.nixos.release}-${pkgs.stdenv.hostPlatform.system}"; + default = "nixos${optionalString (config.isoImage.edition != "") "-${config.isoImage.edition}"}-${config.system.nixos.release}-${pkgs.stdenv.hostPlatform.uname.processor}"; description = '' Specifies the label or volume ID of the generated ISO image. Note that the label is used by stage 1 of the boot process to