M-Labs
/
wfvm
8
0
Fork 5
Code Issues 4 Pull Requests 2 Releases Wiki Activity

[wip] nix_flakes support #14

Draft
mwojcik wants to merge 12 commits from mwojcik/wfvm:nix_flakes into master
pull from: mwojcik/wfvm:nix_flakes
merge into: M-Labs:master
Conversation 12 Commits 12 Files Changed 12 +2 -21
2 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit da2102d504 - Show all commits

1
flake.nix
View File

@ -888,6 +888,7 @@
inherit utils; inherit utils;
inherit makeWindowsImage; inherit makeWindowsImage;
inherit layers;
demo-ssh = utils.wfvm-run { demo-ssh = utils.wfvm-run {
name = "demo-ssh"; name = "demo-ssh";

22
layers/make_msys_packages.sh
View File

@ -2,27 +2,7 @@
set -e set -e
nix-build -E " nix build .#make-msys-packages
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
'';
}
"
./result/bin/wfvm-run-get-msys-packages ./result/bin/wfvm-run-get-msys-packages