From da2102d504ad67eb14e227d0f88f82ce3e39863f Mon Sep 17 00:00:00 2001
From: mwojcik <mw@m-labs.hk>
Date: Fri, 18 Feb 2022 14:36:29 +0800
Subject: [PATCH] flake: export layers, update make_msys_packages for flakes

---
 flake.nix                    |  1 +
 layers/make_msys_packages.sh | 22 +---------------------
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/flake.nix b/flake.nix
index d0f484a..d209721 100644
--- a/flake.nix
+++ b/flake.nix
@@ -888,6 +888,7 @@
 
       inherit utils;
       inherit makeWindowsImage;
+      inherit layers;
 
       demo-ssh = utils.wfvm-run {
         name = "demo-ssh";
diff --git a/layers/make_msys_packages.sh b/layers/make_msys_packages.sh
index fa8595e..ef39678 100755
--- a/layers/make_msys_packages.sh
+++ b/layers/make_msys_packages.sh
@@ -2,27 +2,7 @@
 
 set -e
 
-nix-build -E "
-let
-  pkgs = import <nixpkgs> {};
-  wfvm = import ../default.nix { inherit pkgs; };
-in
-  wfvm.utils.wfvm-run {
-    name = \"get-msys-packages\";
-    image = wfvm.makeWindowsImage { installCommands = [ wfvm.layers.msys2 ]; };
-    script = ''
-      cat > getmsyspackages.bat << EOF
-      set MSYS=C:\\MSYS64
-      set TOOLPREF=mingw-w64-x86_64-
-      set PATH=%MSYS%\usr\bin;%MSYS%\mingw64\bin;%PATH%
-      pacman -Sp %TOOLPREF%gcc %TOOLPREF%binutils make autoconf automake libtool texinfo > packages.txt
-      EOF
-      \${wfvm.utils.win-put}/bin/win-put getmsyspackages.bat
-      \${wfvm.utils.win-exec}/bin/win-exec getmsyspackages
-      \${wfvm.utils.win-get}/bin/win-get packages.txt
-    '';
-  }
-"
+nix build .#make-msys-packages
 
 ./result/bin/wfvm-run-get-msys-packages