Generate a VirtualBox appliance (in OVF format) instead of a disk image

1 files changed, 8 insertions, 9 deletions

diff --git a/release.nix b/release.nix
index 63488d712bb..06fb43bf6d6 100644
--- a/release.nix
+++ b/release.nix
@@ -174,8 +174,8 @@ in {
   });
 
 
-  # A bootable VirtualBox image.  FIXME: generate a OVF appliance?
-  vdi = pkgs.lib.genAttrs systems (system:
+  # A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF).
+  ova = pkgs.lib.genAttrs systems (system:
 
     with import <nixpkgs> { inherit system; };
 
@@ -190,19 +190,18 @@ in {
       }).config;
 
     in
-      # Declare the VDI as a build product so that it shows up in Hydra.
-      runCommand "nixos-vdi-${config.system.nixosVersion}-${system}"
+      # Declare the OVA as a build product so that it shows up in Hydra.
+      runCommand "nixos-ova-${config.system.nixosVersion}-${system}"
         { meta = {
-            description = "NixOS VirtualBox disk image (${system})";
+            description = "NixOS VirtualBox appliance (${system})";
             maintainers = lib.maintainers.eelco;
           };
-          vdi = config.system.build.virtualBoxImage;
+          ova = config.system.build.virtualBoxOVA;
         }
         ''
           mkdir -p $out/nix-support
-          fn=$out/nixos-${config.system.nixosVersion}-${system}.vdi.xz
-          xz < $vdi/*.vdi > $fn
-          echo "file vdi $fn" >> $out/nix-support/hydra-build-products
+          fn=$(echo $ova/*.ova)
+          echo "file ova $fn" >> $out/nix-support/hydra-build-products
         '' # */
 
   );