MultiMC: fix openjdk dependencies and java home

This commit is contained in:
q66 2019-11-25 23:01:38 +01:00 committed by John Zimmermann
parent d7ae7fac78
commit 3c5d0dc422
1 changed files with 2 additions and 2 deletions

View File

@ -8,7 +8,7 @@ _nbtversion="multimc-0.6.1"
_quazipversion="multimc-3" _quazipversion="multimc-3"
build_style=cmake build_style=cmake
configure_args='-DMultiMC_BUILD_PLATFORM=Void -DMultiMC_LAYOUT=lin-system' configure_args='-DMultiMC_BUILD_PLATFORM=Void -DMultiMC_LAYOUT=lin-system'
hostmakedepends="openjdk xxd git" hostmakedepends="openjdk8 xxd git"
makedepends="qt5-devel qt5-x11extras-devel qt5-svg-devel gtk+-devel" makedepends="qt5-devel qt5-x11extras-devel qt5-svg-devel gtk+-devel"
depends="virtual?java-environment" depends="virtual?java-environment"
short_desc="Instanced Minecraft client" short_desc="Instanced Minecraft client"
@ -24,7 +24,7 @@ checksum="3ec38a5f622048ba3926f0e20fb296d646c7848f8313143062b3e2bd273149ae
skip_extraction="${_nbtversion}.tar.gz ${_quazipversion}.tar.gz" skip_extraction="${_nbtversion}.tar.gz ${_quazipversion}.tar.gz"
pre_configure() { pre_configure() {
export JAVA_HOME=/usr/lib/jvm/openjdk export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
export PATH=$PATH:$JAVA_HOME/bin export PATH=$PATH:$JAVA_HOME/bin
tar zxvf "${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_nbtversion}.tar.gz" -C "${wrksrc}/libraries/libnbtplusplus" --strip-components 1 tar zxvf "${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_nbtversion}.tar.gz" -C "${wrksrc}/libraries/libnbtplusplus" --strip-components 1
tar zxvf "${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_quazipversion}.tar.gz" -C "${wrksrc}/libraries/quazip" --strip-components 1 tar zxvf "${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_quazipversion}.tar.gz" -C "${wrksrc}/libraries/quazip" --strip-components 1