From 02818a825162a30dbc065ebb1002fb346802840e Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Fri, 30 Oct 2020 13:23:28 +0400 Subject: [PATCH] Use new tg_owt installation support in snap --- snap/snapcraft.yaml | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index c1c4ff59f..bb734601b 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -67,8 +67,6 @@ parts: source: . source-type: git parse-info: [usr/share/metainfo/telegram-desktop_telegram-desktop.appdata.xml] - build-environment: - - tg_owt_DIR: $SNAPCRAFT_STAGE/tg_owt build-packages: - python - qtbase5-private-dev @@ -268,16 +266,11 @@ parts: stage-packages: - libopus0 - libssl1.1 - override-build: | - cmake "$SNAPCRAFT_PART_SRC" \ - -DCMAKE_BUILD_TYPE=Release \ - -DJPEG_LIBRARY_RELEASE="$SNAPCRAFT_STAGE/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libjpeg.so" \ - -DJPEG_INCLUDE_DIR="$SNAPCRAFT_STAGE/usr/include" - - cmake --build . -- -j$(nproc) - cp -a . "$SNAPCRAFT_PART_INSTALL" - organize: - "*": tg_owt/ + cmake-parameters: + - -DCMAKE_BUILD_TYPE=Release + - -DCMAKE_INSTALL_PREFIX=/usr + - -DJPEG_LIBRARY_RELEASE=$SNAPCRAFT_STAGE/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libjpeg.so + - -DJPEG_INCLUDE_DIR=$SNAPCRAFT_STAGE/usr/include prime: [-./*] after: - ffmpeg