lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-04-21 21:52:03 +02:00
Code Activity

snapcraft: fix build

Browse source 
Change-Id: I8ac570f0ad859b2ea2ee83ca8fe3927848148ff3
This commit is contained in:
Sébastien Blin 2024-04-15 13:29:42 -04:00
parent 588a8abdac
commit 51ef7a83da
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
extras/packaging/gnu-linux/docker/Dockerfile_snap
View file

@ -1,5 +1,5 @@
ARG RISK=edge ARG RISK=edge
ARG UBUNTU=jammy ARG UBUNTU=focal
FROM ubuntu:$UBUNTU as builder FROM ubuntu:$UBUNTU as builder
ARG RISK 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="/snap/snapcraft/current"
ENV SNAP_NAME="snapcraft" ENV SNAP_NAME="snapcraft"
ENV SNAP_ARCH="amd64" ENV SNAP_ARCH="amd64"
ENV DISABLE_PIPEWIRE=true
ADD extras/packaging/gnu-linux/scripts/build-package-snap.sh /opt/build-package-snap.sh ADD extras/packaging/gnu-linux/scripts/build-package-snap.sh /opt/build-package-snap.sh
CMD ["/opt/build-package-snap.sh"] CMD ["/opt/build-package-snap.sh"]

6
extras/packaging/gnu-linux/rules/snap/jami/snapcraft.yaml
View file

@ -168,7 +168,7 @@ package-repositories:
components: [main] components: [main]
suites: [jami] suites: [jami]
key-id: A295D773307D25A33AE72F2F64CD5FA175348F84 key-id: A295D773307D25A33AE72F2F64CD5FA175348F84
url: https://dl.jami.net/nightly/ubuntu_22.04/ url: https://dl.jami.net/nightly/ubuntu_20.04/
parts: parts:
desktop-launch: desktop-launch:
@ -304,7 +304,7 @@ parts:
- libswscale-dev - libswscale-dev
- libva-dev - libva-dev
- libvdpau-dev - libvdpau-dev
- libpipewire-0.3-dev - libpipewire-0.2-dev
- libargon2-0-dev # opendht - libargon2-0-dev # opendht
- libexpat1-dev - libexpat1-dev
- libjsoncpp-dev - libjsoncpp-dev
@ -327,7 +327,7 @@ parts:
- libegl1 - libegl1
- libgbm1 - libgbm1
- libgudev-1.0-0 - libgudev-1.0-0
- libjsoncpp25 - libjsoncpp1
- libllvm12 - libllvm12
- libminizip1 - libminizip1
- libnm0 - libnm0