From 6d9b3abcd7a50e1ccbef167fd41a4343579b2548 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Tue, 22 Mar 2022 22:14:46 +0800 Subject: [PATCH] nicer MSYS2 development shell --- flake.nix | 8 ++++++-- windows/default.nix | 6 ++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index b7071531d..7c28b262c 100644 --- a/flake.nix +++ b/flake.nix @@ -126,11 +126,15 @@ cargo-insta clippy rustfmt - # MSYS2 + ]; + }; + devShells.x86_64-linux.msys2 = pkgs.mkShell { + name = "nac3-dev-shell"; + buildInputs = with pkgs; [ curl pacman fakeroot - wineWowPackages.stable + packages.x86_64-w64-mingw32.wine-msys2 ]; }; diff --git a/windows/default.nix b/windows/default.nix index 4ff49eae6..1a4ed6700 100644 --- a/windows/default.nix +++ b/windows/default.nix @@ -98,4 +98,10 @@ in rec { ''; dontFixup = true; }; + wine-msys2 = pkgs.writeShellScriptBin "wine-msys2" + '' + export WINEDEBUG=-all + export WINEPATH=Z:${msys2-env}/mingw64/bin\;Z:${llvm-nac3}/bin + ${pkgs.wineWowPackages.stable}/bin/wine64 cmd + ''; }