Skip to content

Commit

Permalink
Fix docker & snap build
Browse files Browse the repository at this point in the history
  • Loading branch information
ilya-fedin authored and john-preston committed Dec 1, 2023
1 parent 06564ef commit 85f5621
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Telegram/build/docker/centos_env/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down
1 change: 0 additions & 1 deletion snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,6 @@ parts:
- --prefix=/usr
- --strip
- -Dtests=false
- -Dintrospection=disabled
prime:
- -./usr/include
- -./usr/lib/$CRAFT_ARCH_TRIPLET/pkgconfig
Expand Down

0 comments on commit 85f5621

Please sign in to comment.