diff --git a/flake.nix b/flake.nix
index b707153..7c28b26 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 4ff49ea..1a4ed67 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
+    '';
 }