From fe390ca09b7d46d9b10028f5070113064fe58fe2 Mon Sep 17 00:00:00 2001 From: Krille Date: Sun, 30 Mar 2025 10:37:31 +0200 Subject: [PATCH] Revert "build: Install flutter via git in snapcraft" This reverts commit cd12f773fe9786556589a9078a3303c516f81634. --- snap/snapcraft.yaml | 33 +++++---------------------------- 1 file changed, 5 insertions(+), 28 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 7aa1d882c..87efdcd88 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -61,41 +61,18 @@ parts: build-packages: - g++ - flutter-git: - source: https://github.com/flutter/flutter.git - source-tag: 3.29.2 - plugin: nil - override-build: | - set -eux - mkdir -p $CRAFT_PART_INSTALL/usr/bin - mkdir -p $CRAFT_PART_INSTALL/usr/libexec - cp -r $CRAFT_PART_SRC $CRAFT_PART_INSTALL/usr/libexec/flutter - ln -sf $CRAFT_PART_INSTALL/usr/libexec/flutter/bin/flutter $CRAFT_PART_INSTALL/usr/bin/flutter - export PATH="$CRAFT_PART_INSTALL/usr/bin:$PATH" - flutter doctor - build-packages: - - clang - - cmake - - curl - - ninja-build - - unzip - override-prime: '' - fluffychat: - after: [ flutter-git ] - plugin: nil + plugin: flutter source: . override-build: | - flutter pub get || true - flutter build linux --release -v - mkdir -p $CRAFT_PART_INSTALL/bin - cp -r build/linux/*/release/bundle/* $CRAFT_PART_INSTALL/bin/ + # Workaround for Flutter build error: + rm -rf build + craftctl default build-packages: - libsecret-1-dev - libjsoncpp-dev - libssl-dev - curl - - jq stage-packages: - libsecret-1-0 - libjsoncpp25 @@ -108,7 +85,7 @@ slots: apps: fluffychat: - command: bin/fluffychat + command: fluffychat extensions: [ gnome ] plugs: - audio-playback