diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2020-04-09 20:10:01 -0400 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2020-04-09 20:10:01 -0400 |
| commit | df8c30fa25637f7ae6fe427dc6d55536707a5e92 (patch) | |
| tree | 04bcf4dfba9947fe71e84681047f812eef8c6d92 /nixos/modules/installer/cd-dvd/iso-image.nix | |
| parent | a775961c8f54c09f6a97c1091d4198605c4baf85 (diff) | |
| download | nixpkgs-df8c30fa25637f7ae6fe427dc6d55536707a5e92.tar nixpkgs-df8c30fa25637f7ae6fe427dc6d55536707a5e92.tar.gz nixpkgs-df8c30fa25637f7ae6fe427dc6d55536707a5e92.tar.bz2 nixpkgs-df8c30fa25637f7ae6fe427dc6d55536707a5e92.tar.lz nixpkgs-df8c30fa25637f7ae6fe427dc6d55536707a5e92.tar.xz nixpkgs-df8c30fa25637f7ae6fe427dc6d55536707a5e92.tar.zst nixpkgs-df8c30fa25637f7ae6fe427dc6d55536707a5e92.zip | |
iso-image: make $ARCH shorter
we use stdenv.hostPlatform.uname.processor, which I believe is just like
`uname -p`.
Example values:
```
(import <nixpkgs> { system = "x86_64-linux"; }).stdenv.hostPlatform.uname.processor
"x86_64"
(import <nixpkgs> { system = "aarch64-linux"; }).stdenv.hostPlatform.uname.processor
aarch64
(import <nixpkgs> { system = "armv7l-linux"; }).stdenv.hostPlatform.uname.processor
"armv7l"
```
Diffstat (limited to 'nixos/modules/installer/cd-dvd/iso-image.nix')
| -rw-r--r-- | nixos/modules/installer/cd-dvd/iso-image.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index b85f20bb09b..5243a8aa747 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 |