mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2025-06-05 06:33:57 +02:00
Fix docker & snap build
This commit is contained in:
parent
06564efe0e
commit
85f56217a8
2 changed files with 2 additions and 3 deletions
|
@ -703,7 +703,7 @@ RUN git clone -b xkbcommon-1.6.0 --depth=1 {{ GIT }}/xkbcommon/libxkbcommon.git
|
||||||
&& cd .. \
|
&& cd .. \
|
||||||
&& rm -rf libxkbcommon
|
&& rm -rf libxkbcommon
|
||||||
|
|
||||||
FROM patches AS glib
|
FROM builder AS glib
|
||||||
RUN git clone -b 2.78.1 --depth=1 {{ GIT }}/GNOME/glib.git \
|
RUN git clone -b 2.78.1 --depth=1 {{ GIT }}/GNOME/glib.git \
|
||||||
&& cd glib \
|
&& cd glib \
|
||||||
&& meson build \
|
&& meson build \
|
||||||
|
@ -716,7 +716,7 @@ RUN git clone -b 2.78.1 --depth=1 {{ GIT }}/GNOME/glib.git \
|
||||||
&& cd .. \
|
&& cd .. \
|
||||||
&& rm -rf glib
|
&& rm -rf glib
|
||||||
|
|
||||||
FROM builder AS glibmm
|
FROM patches AS glibmm
|
||||||
COPY --link --from=glib {{ LibrariesPath }}/glib-cache /
|
COPY --link --from=glib {{ LibrariesPath }}/glib-cache /
|
||||||
|
|
||||||
RUN git clone -b 2.78.0 --depth=1 {{ GIT }}/GNOME/glibmm.git \
|
RUN git clone -b 2.78.0 --depth=1 {{ GIT }}/GNOME/glibmm.git \
|
||||||
|
|
|
@ -272,7 +272,6 @@ parts:
|
||||||
- --prefix=/usr
|
- --prefix=/usr
|
||||||
- --strip
|
- --strip
|
||||||
- -Dtests=false
|
- -Dtests=false
|
||||||
- -Dintrospection=disabled
|
|
||||||
prime:
|
prime:
|
||||||
- -./usr/include
|
- -./usr/include
|
||||||
- -./usr/lib/$CRAFT_ARCH_TRIPLET/pkgconfig
|
- -./usr/lib/$CRAFT_ARCH_TRIPLET/pkgconfig
|
||||||
|
|
Loading…
Add table
Reference in a new issue