M-Labs/nix-scripts
9
0
Fork 9
Code Issues 6 Pull Requests Releases Wiki Activity

wfvm: move out MSYS2 package list

Browse Source
This commit is contained in:
Sebastien Bourdeauducq 2020-06-27 17:22:34 +08:00
parent 486b343b15
commit 6eecb5085d
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artiq-fast/conda-windows/binutils.nix
View File

@ -19,7 +19,7 @@ let
};
build = wfvm.utils.wfvm-run {
name = "build-binutils";
image = wfvm.makeWindowsImage { installCommands = with wfvm.layers; [ anaconda3 msys2 msys2-packages ]; };
image = wfvm.makeWindowsImage { installCommands = with wfvm.layers; [ anaconda3 msys2 (msys2-packages (import ./msys_packages.nix { inherit pkgs; } )) ]; };
script = ''
# Create a fake channel to work around another pile of bugs and cretinous design decisions from conda.
${wfvm.utils.win-exec}/bin/win-exec "mkdir fake-channel && mkdir fake-channel\win-64"

0
artiq-fast/wfvm/layers/msys_packages.nix → artiq-fast/conda-windows/msys_packages.nix
View File

2
artiq-fast/wfvm/demo-image.nix
View File

@ -37,7 +37,7 @@ wfvm.makeWindowsImage {
# administratorPassword = "12345";
# Imperative installation commands, to be installed incrementally
installCommands = with wfvm.layers; [ anaconda3 msys2 msys2-packages ];
installCommands = with wfvm.layers; [ anaconda3 msys2 msvc msvc-ide-unbreak ];
# services = {
# # Enable remote management

3
artiq-fast/wfvm/layers/default.nix
View File

@ -44,10 +44,9 @@ in
echo MSYS2 installer finished
'';
};
msys2-packages = {
msys2-packages = msys-packages: {
name = "MSYS2-packages";
script = let
msys-packages = import ./msys_packages.nix { inherit pkgs; };
msys-packages-put = pkgs.lib.strings.concatStringsSep "\n"
(map (package: ''win-put ${package} 'msyspackages' '') msys-packages);
in