summary refs log tree commit diff
diff options
context:
space:
mode:
authorMartin Weinelt <hexa@darmstadt.ccc.de>2022-09-30 01:42:19 +0200
committerMartin Weinelt <hexa@darmstadt.ccc.de>2022-10-11 15:33:41 +0200
commit9328b7eebf6afbd345f20f5d76b6357f85037506 (patch)
tree2abf3144448b85dbfc4503784295f5b6174015fc
parentcd5cc11918cd56ae077ed098a8b6bbd2aa77ccdb (diff)
downloadnixpkgs-9328b7eebf6afbd345f20f5d76b6357f85037506.tar
nixpkgs-9328b7eebf6afbd345f20f5d76b6357f85037506.tar.gz
nixpkgs-9328b7eebf6afbd345f20f5d76b6357f85037506.tar.bz2
nixpkgs-9328b7eebf6afbd345f20f5d76b6357f85037506.tar.lz
nixpkgs-9328b7eebf6afbd345f20f5d76b6357f85037506.tar.xz
nixpkgs-9328b7eebf6afbd345f20f5d76b6357f85037506.tar.zst
nixpkgs-9328b7eebf6afbd345f20f5d76b6357f85037506.zip
nixos/release-combined: Build graphical ISOs for aarch64-linux
-rw-r--r--nixos/release-combined.nix4
-rw-r--r--nixos/release.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 7be47a4c3e5..fa6c87b5222 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -50,8 +50,8 @@ in rec {
         (onFullSupported "nixos.dummy")
         (onAllSupported "nixos.iso_minimal")
         (onSystems ["x86_64-linux" "aarch64-linux"] "nixos.amazonImage")
-        (onSystems ["x86_64-linux"] "nixos.iso_plasma5")
-        (onSystems ["x86_64-linux"] "nixos.iso_gnome")
+        (onFullSupported "nixos.iso_plasma5")
+        (onFullSupported "nixos.iso_gnome")
         (onFullSupported "nixos.manual")
         (onSystems ["x86_64-linux"] "nixos.ova")
         (onSystems ["aarch64-linux"] "nixos.sd_image")
diff --git a/nixos/release.nix b/nixos/release.nix
index 4f27e5dbb21..919aa86a2d6 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -169,13 +169,13 @@ in rec {
     inherit system;
   });
 
-  iso_plasma5 = forMatchingSystems [ "x86_64-linux" ] (system: makeIso {
+  iso_plasma5 = forMatchingSystems supportedSystems (system: makeIso {
     module = ./modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nix;
     type = "plasma5";
     inherit system;
   });
 
-  iso_gnome = forMatchingSystems [ "x86_64-linux" ] (system: makeIso {
+  iso_gnome = forMatchingSystems supportedSystems (system: makeIso {
     module = ./modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix;
     type = "gnome";
     inherit system;