From 85f56217a84736f0170e6427b2e044068c7a5af8 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Fri, 1 Dec 2023 14:29:35 +0400 Subject: [PATCH] Fix docker & snap build --- Telegram/build/docker/centos_env/Dockerfile | 4 ++-- snap/snapcraft.yaml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index d8c4eb527771d..8c1a4f703397f 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -703,7 +703,7 @@ RUN git clone -b xkbcommon-1.6.0 --depth=1 {{ GIT }}/xkbcommon/libxkbcommon.git && cd .. \ && rm -rf libxkbcommon -FROM patches AS glib +FROM builder AS glib RUN git clone -b 2.78.1 --depth=1 {{ GIT }}/GNOME/glib.git \ && cd glib \ && meson build \ @@ -716,7 +716,7 @@ RUN git clone -b 2.78.1 --depth=1 {{ GIT }}/GNOME/glib.git \ && cd .. \ && rm -rf glib -FROM builder AS glibmm +FROM patches AS glibmm COPY --link --from=glib {{ LibrariesPath }}/glib-cache / RUN git clone -b 2.78.0 --depth=1 {{ GIT }}/GNOME/glibmm.git \ diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 9461c60aeaa26..81b19266901eb 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -272,7 +272,6 @@ parts: - --prefix=/usr - --strip - -Dtests=false - - -Dintrospection=disabled prime: - -./usr/include - -./usr/lib/$CRAFT_ARCH_TRIPLET/pkgconfig