From 3c5d0dc422a0d7e2917f954f676051193faf60a0 Mon Sep 17 00:00:00 2001 From: q66 Date: Mon, 25 Nov 2019 23:01:38 +0100 Subject: [PATCH] MultiMC: fix openjdk dependencies and java home --- srcpkgs/MultiMC/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/MultiMC/template b/srcpkgs/MultiMC/template index b38ba6ca597..35d9bbcc959 100644 --- a/srcpkgs/MultiMC/template +++ b/srcpkgs/MultiMC/template @@ -8,7 +8,7 @@ _nbtversion="multimc-0.6.1" _quazipversion="multimc-3" build_style=cmake 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" depends="virtual?java-environment" short_desc="Instanced Minecraft client" @@ -24,7 +24,7 @@ checksum="3ec38a5f622048ba3926f0e20fb296d646c7848f8313143062b3e2bd273149ae skip_extraction="${_nbtversion}.tar.gz ${_quazipversion}.tar.gz" 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 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