forked from M-Labs/nix-scripts
wfvm: move out MSYS2 package list
This commit is contained in:
parent
486b343b15
commit
6eecb5085d
|
@ -19,7 +19,7 @@ let
|
||||||
};
|
};
|
||||||
build = wfvm.utils.wfvm-run {
|
build = wfvm.utils.wfvm-run {
|
||||||
name = "build-binutils";
|
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 = ''
|
script = ''
|
||||||
# Create a fake channel to work around another pile of bugs and cretinous design decisions from conda.
|
# 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"
|
${wfvm.utils.win-exec}/bin/win-exec "mkdir fake-channel && mkdir fake-channel\win-64"
|
||||||
|
|
|
@ -37,7 +37,7 @@ wfvm.makeWindowsImage {
|
||||||
# administratorPassword = "12345";
|
# administratorPassword = "12345";
|
||||||
|
|
||||||
# Imperative installation commands, to be installed incrementally
|
# 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 = {
|
# services = {
|
||||||
# # Enable remote management
|
# # Enable remote management
|
||||||
|
|
|
@ -44,10 +44,9 @@ in
|
||||||
echo MSYS2 installer finished
|
echo MSYS2 installer finished
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
msys2-packages = {
|
msys2-packages = msys-packages: {
|
||||||
name = "MSYS2-packages";
|
name = "MSYS2-packages";
|
||||||
script = let
|
script = let
|
||||||
msys-packages = import ./msys_packages.nix { inherit pkgs; };
|
|
||||||
msys-packages-put = pkgs.lib.strings.concatStringsSep "\n"
|
msys-packages-put = pkgs.lib.strings.concatStringsSep "\n"
|
||||||
(map (package: ''win-put ${package} 'msyspackages' '') msys-packages);
|
(map (package: ''win-put ${package} 'msyspackages' '') msys-packages);
|
||||||
in
|
in
|
||||||
|
|
Loading…
Reference in New Issue