diff --git a/extras/packaging/gnu-linux/docker/Dockerfile_snap b/extras/packaging/gnu-linux/docker/Dockerfile_snap index a0f1b7ae96a4fede7f73f5461aed5ffbd706b3fb..e9a59a48624033d12b1427b4d34817e7038569e5 100644 --- a/extras/packaging/gnu-linux/docker/Dockerfile_snap +++ b/extras/packaging/gnu-linux/docker/Dockerfile_snap @@ -1,5 +1,5 @@ ARG RISK=edge -ARG UBUNTU=jammy +ARG UBUNTU=focal FROM ubuntu:$UBUNTU as builder ARG RISK @@ -83,6 +83,7 @@ ENV PATH="/snap/bin:/snap/snapcraft/current/usr/bin:/snap/snapcraft/current/libe ENV SNAP="/snap/snapcraft/current" ENV SNAP_NAME="snapcraft" ENV SNAP_ARCH="amd64" +ENV DISABLE_PIPEWIRE=true ADD extras/packaging/gnu-linux/scripts/build-package-snap.sh /opt/build-package-snap.sh CMD ["/opt/build-package-snap.sh"] diff --git a/extras/packaging/gnu-linux/rules/snap/jami/snapcraft.yaml b/extras/packaging/gnu-linux/rules/snap/jami/snapcraft.yaml index f7cb3566e89218853f6c8a37749b6c8f446fef43..c32cd20a6cee78eeec43471542ea34a7092ad2ea 100644 --- a/extras/packaging/gnu-linux/rules/snap/jami/snapcraft.yaml +++ b/extras/packaging/gnu-linux/rules/snap/jami/snapcraft.yaml @@ -168,7 +168,7 @@ package-repositories: components: [main] suites: [jami] key-id: A295D773307D25A33AE72F2F64CD5FA175348F84 - url: https://dl.jami.net/nightly/ubuntu_22.04/ + url: https://dl.jami.net/nightly/ubuntu_20.04/ parts: desktop-launch: @@ -304,7 +304,7 @@ parts: - libswscale-dev - libva-dev - libvdpau-dev - - libpipewire-0.3-dev + - libpipewire-0.2-dev - libargon2-0-dev # opendht - libexpat1-dev - libjsoncpp-dev @@ -327,7 +327,7 @@ parts: - libegl1 - libgbm1 - libgudev-1.0-0 - - libjsoncpp25 + - libjsoncpp1 - libllvm12 - libminizip1 - libnm0