using msys2 devkit

Signed-off-by: Matt Wrock <matt@mattwrock.com>
chef · Jun 29, 2022 · ff6c7be · ff6c7be
1 parent 0cf2c88
commit ff6c7be
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/omnibus/config/projects/chef-workstation.rb b/omnibus/config/projects/chef-workstation.rb
@@ -81,8 +81,7 @@
 # This *has* to be last, as it mutates the build environment and causes all
 # compilations that use ./configure et all (the msys env) to break
 if windows?
-  dependency "ruby-windows-devkit"
-  dependency "ruby-windows-devkit-bash"
+  dependency "ruby-msys2-devkit"
   dependency "ruby-windows-system-libraries"
 end
 

diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
@@ -23,7 +23,7 @@
 override "openssl", version: macos? ? "1.1.1m" : "1.0.2zb"
 override "pkg-config-lite", version: "0.28-1"
 override "ruby", version: "3.0.3"
-override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18"
+override "ruby-msys2-devkit", version: "3.0.3-1"
 override "rust", version: "1.37.0"
 override "util-macros", version: "1.19.0"
 override "xproto", version: "7.0.28"