Use arch sensitive envs for snap

RetGal · Nov 5, 2023 · 2db4d6e · 2db4d6e
1 parent 5a1bdda
commit 2db4d6e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/snap/snapcraft.core22.yaml b/snap/snapcraft.core22.yaml
@@ -25,7 +25,7 @@ apps:
     extensions:
       [gnome]
     environment:
-      JAVA_HOME: $SNAP/usr/lib/jvm/java-11-openjdk-amd64
+      JAVA_HOME: $SNAP/usr/lib/jvm/java-11-openjdk-$SNAP_ARCH
       PATH: $JAVA_HOME/bin:$JAVA_HOME/jre/bin:$PATH
     command: bin/dayon.launcher $SNAP/jar/dayon.jar $1 $2 $3 $4 $5
     desktop: ../parts/dayon/build/target/dayon.assisted.desktop
@@ -36,7 +36,7 @@ apps:
     extensions:
       [gnome]
     environment:
-      JAVA_HOME: $SNAP/usr/lib/jvm/java-11-openjdk-amd64
+      JAVA_HOME: $SNAP/usr/lib/jvm/java-11-openjdk-$SNAP_ARCH
       PATH: $JAVA_HOME/bin:$JAVA_HOME/jre/bin:$PATH
     command: bin/dayon.launcher $SNAP/jar/dayon.jar assistant $1 $2 $3
     desktop: ../parts/dayon/build/target/dayon.assistant.desktop

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -20,7 +20,7 @@ apps:
     extensions:
       [gnome-3-28]
     environment:
-      JAVA_HOME: $SNAP/usr/lib/jvm/java-11-openjdk-amd64
+      JAVA_HOME: $SNAP/usr/lib/jvm/java-11-openjdk-$SNAP_ARCH
       PATH: $JAVA_HOME/bin:$JAVA_HOME/jre/bin:$PATH
     command: bin/dayon.launcher $SNAP/jar/dayon.jar $1 $2 $3 $4 $5
     desktop: ../parts/dayon/build/target/dayon.assisted.desktop
@@ -31,7 +31,7 @@ apps:
     extensions:
       [gnome-3-28]
     environment:
-      JAVA_HOME: $SNAP/usr/lib/jvm/java-11-openjdk-amd64
+      JAVA_HOME: $SNAP/usr/lib/jvm/java-11-openjdk-$SNAP_ARCH
       PATH: $JAVA_HOME/bin:$JAVA_HOME/jre/bin:$PATH
     command: bin/dayon.launcher $SNAP/jar/dayon.jar assistant $1 $2 $3
     desktop: ../parts/dayon/build/target/dayon.assistant.desktop