From 6542c378639ba9705470ea79bdc4920288553ab7 Mon Sep 17 00:00:00 2001 From: Astro Date: Thu, 13 Oct 2022 21:41:03 +0200 Subject: [PATCH] wfvm/demo-image: make buildable from flake --- flake.nix | 4 ++++ wfvm/demo-image.nix | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 5932ac6..920e60f 100644 --- a/flake.nix +++ b/flake.nix @@ -16,5 +16,9 @@ lib = import ./wfvm { inherit pkgs; }; + + packages.${system}.demoImage = import ./wfvm/demo-image.nix { + inherit self; + }; }; } diff --git a/wfvm/demo-image.nix b/wfvm/demo-image.nix index a928de1..cede253 100644 --- a/wfvm/demo-image.nix +++ b/wfvm/demo-image.nix @@ -1,7 +1,17 @@ -{ pkgs ? import {}, impureMode ? false }: +{ pkgs ? import {} +# Whether to generate just a script to start and debug the windows installation +, impureMode ? false +# Flake input `self` +, self ? null +}: let - wfvm = (import ./default.nix { inherit pkgs; }); + wfvm = + if self == null + # nix-build + then (import ./default.nix { inherit pkgs; }) + # built from flake.nix + else self.lib; in wfvm.makeWindowsImage { # Build install script & skip building iso