diff options
Diffstat (limited to 'PKGBUILD')
| -rw-r--r-- | PKGBUILD | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -1,14 +1,15 @@ pkgname=briar-desktop-git _pkgname=briar-desktop pkgver=r307.38723c4 -pkgrel=1 +pkgrel=2 _build_type=nightly pkgdesc='Prototyping the next generation for Briar on desktop devices' arch=('x86_64' 'aarch64' 'armv7h') url="https://code.briarproject.org/briar/briar-desktop" license=('GPL') -depends=('java-runtime>=17' 'bash' 'briar-headless-git') -makedepends=('git' 'jdk-openjdk>=17') +# let's limit it to <18 just in case 18 comes out sooner than expected (causing our hard java-17-path to cause trouble): +depends=('java-runtime>=17' 'java-runtime<18' 'bash') +makedepends=('git' 'jdk-openjdk>=17' 'jdk-openjdk<18') conflicts=('briar-desktop') source=("${_pkgname}::git+https://code.briarproject.org/briar/briar-desktop.git" "briar::git+https://code.briarproject.org/briar/briar") @@ -42,7 +43,6 @@ prepare() { build() { cd "${_pkgname}" export PATH="/usr/lib/jvm/java-17-openjdk/jre/bin/:$PATH" - # export JAVA_HOME=/usr/lib/jvm/java-17-openjdk ./gradlew -Dorg.gradle.java.home=/usr/lib/jvm/java-17-openjdk --no-daemon -PbuildType=${_build_type} packageUberJarForCurrentOS } @@ -52,7 +52,7 @@ package() { install -dm755 "$pkgdir/usr/bin/" cat << EOF > "$pkgdir/usr/bin/$_pkgname" #!/bin/sh -exec /usr/bin/java -jar '/usr/share/java/briar-desktop.jar' "\$@" +exec /usr/lib/jvm/java-17-openjdk/bin/java -jar '/usr/share/java/briar-desktop.jar' "\$@" EOF chmod +x "$pkgdir/usr/bin/$_pkgname" |