diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD index 18bf7ee..8d1c8cd 100644 --- a/trunk/PKGBUILD +++ b/trunk/PKGBUILD @@ -17,8 +17,8 @@ url="https://vagrantup.com" license=('MIT') options=('!emptydirs') depends=('curl' 'libarchive' 'libssh2' 'libxml2' 'libxslt' 'rsync' - 'ruby2.7' 'xz' 'perl') -makedepends=('git' 'go') + 'ruby' 'xz' 'perl') +makedepends=('git' 'go' 'rubygems') conflicts=('vagrant-substrate') replaces=('vagrant-substrate') source=($pkgname-$pkgver.tar.gz::https://github.com/mitchellh/$pkgname/archive/v$pkgver.tar.gz @@ -29,12 +29,11 @@ md5sums=('0738a0384ccd9cbf4d047638ea493625' prepare() { cd vagrant-installers - sed -i 's/rubyPath = "ruby"$/rubyPath = "ruby-2.7"/' substrate/launcher/main.go } build() { cd $pkgname-$pkgver - gem-2.7 build $pkgname.gemspec + gem build $pkgname.gemspec export GO111MODULE=off # golang 1.16 uses modules by default and packages below fail to compile cd "$srcdir"/vagrant-installers/substrate/launcher @@ -60,7 +59,7 @@ package() { GEM_PATH="$EMBEDDED_DIR"/gems/$pkgver GEM_HOME="$GEM_PATH" \ GEMRC="$EMBEDDED_DIR"/etc/gemrc \ - gem-2.7 install $pkgname-$pkgver.gem --no-document --prerelease + gem install $pkgname-$pkgver.gem --no-document --prerelease install -Dm755 "$INSTALLERS_DIR"/launcher/vagrant \ "$pkgdir"/opt/$pkgname/bin/$pkgname