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

fix after deleting default.nix from wfvm

This commit is contained in:
mwojcik 2022-03-14 15:50:13 +08:00
parent 53de3429e3
commit db47903846
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wfvm/layers/default.nix
View File

@ -1,6 +1,7 @@
{ pkgs }: { pkgs }:
let let
wfvm = import ../. { inherit pkgs; }; makeWindowsImage = attrs: import ../win.nix ({ inherit pkgs; } // attrs );
utils = import ../utils.nix { inherit pkgs; };
in in
{ {
anaconda3 = { anaconda3 = {
@ -75,17 +76,17 @@ in
sha256 = "sha256-bxi8LsvNxSZshkTbhK/FEmMx84NKYB7TUNOm9sAKXS8="; sha256 = "sha256-bxi8LsvNxSZshkTbhK/FEmMx84NKYB7TUNOm9sAKXS8=";
}; };
# This touchy-feely "community" piece of trash seems deliberately crafted to break Wine, so we use the VM to run it. # This touchy-feely "community" piece of trash seems deliberately crafted to break Wine, so we use the VM to run it.
download-vs = wfvm.utils.wfvm-run { download-vs = utils.wfvm-run {
name = "download-vs"; name = "download-vs";
image = wfvm.makeWindowsImage { }; image = makeWindowsImage { };
isolateNetwork = false; isolateNetwork = false;
script = script =
'' ''
ln -s ${bootstrapper} vs_Community.exe ln -s ${bootstrapper} vs_Community.exe
${wfvm.utils.win-put}/bin/win-put vs_Community.exe ${utils.win-put}/bin/win-put vs_Community.exe
rm vs_Community.exe rm vs_Community.exe
${wfvm.utils.win-exec}/bin/win-exec "vs_Community.exe --quiet --norestart --layout c:\vslayout --add Microsoft.VisualStudio.Workload.NativeDesktop --includeRecommended --lang en-US" ${utils.win-exec}/bin/win-exec "vs_Community.exe --quiet --norestart --layout c:\vslayout --add Microsoft.VisualStudio.Workload.NativeDesktop --includeRecommended --lang en-US"
${wfvm.utils.win-get}/bin/win-get /c:/vslayout ${utils.win-get}/bin/win-get /c:/vslayout
''; '';
}; };
cache = pkgs.stdenv.mkDerivation { cache = pkgs.stdenv.mkDerivation {