diff --git a/flake.nix b/flake.nix index 06801cf0..a6a166c8 100644 --- a/flake.nix +++ b/flake.nix @@ -146,7 +146,7 @@ in { installerSystem = installerConfiguration; installer = let - isoName = installerConfiguration.config.isoImage.isoName; + isoName = "${installerConfiguration.config.image.baseName}.iso"; isoPath = "${installerConfiguration.config.system.build.isoImage}/iso/${isoName}"; in pkgs.runCommandLocal isoName { inherit isoPath; } ''ln -s "$isoPath" $out''; }; diff --git a/installer/default.nix b/installer/default.nix index 0e2a5f97..091bdba1 100644 --- a/installer/default.nix +++ b/installer/default.nix @@ -11,8 +11,8 @@ boot.initrd.systemd.enable = lib.mkImageMediaOverride false; boot.initrd.systemd.emergencyAccess = lib.mkImageMediaOverride true; - isoImage.isoName = lib.mkImageMediaOverride - "foosteros-${config.system.build.installHostname}-${config.system.nixos.release}-${self.shortRev or "dirty"}-${pkgs.stdenv.hostPlatform.uname.processor}.iso"; + image.baseName = lib.mkImageMediaOverride + "foosteros-${config.system.build.installHostname}-${config.system.nixos.release}-${self.shortRev or "dirty"}-${pkgs.stdenv.hostPlatform.uname.processor}"; isoImage.volumeID = "foosteros-${config.system.nixos.release}-${self.shortRev or "dirty"}-${pkgs.stdenv.hostPlatform.uname.processor}"; networking.hostName = lib.mkImageMediaOverride "${config.system.build.installHostname}-installer";