diff --git a/checkbox-core-snap/series24/snap/snapcraft.yaml b/checkbox-core-snap/series24/snap/snapcraft.yaml index 317e2b1910..0e540c9268 100644 --- a/checkbox-core-snap/series24/snap/snapcraft.yaml +++ b/checkbox-core-snap/series24/snap/snapcraft.yaml @@ -61,10 +61,6 @@ slots: read: - / -package-repositories: - - type: apt - ppa: checkbox-dev/stable - parts: version-calculator: plugin: dump @@ -434,27 +430,9 @@ parts: gnome-randr: source: https://github.com/maxwellainatchi/gnome-randr-rust.git plugin: rust + rust-channel: nightly build-packages: - libdbus-1-dev - after: [rust-deps] -################################################################################ - rust-deps: - plugin: nil - build-packages: - - wget - override-pull: | - # Do not use rustup to work around https://forum.snapcraft.io/t/armhf-builds-on-launchpad-timing-out/31008 - REQUIRED_RUST_VERSION=nightly - ROOT=https://static.rust-lang.org/dist/rust-$REQUIRED_RUST_VERSION - if [ $CRAFT_TARGET_ARCH = "amd64" ]; then - BINARIES_SUFFIX=x86_64-unknown-linux-gnu - elif [ $CRAFT_TARGET_ARCH = "armhf" ]; then - BINARIES_SUFFIX=armv7-unknown-linux-gnueabihf - elif [ $CRAFT_TARGET_ARCH = "arm64" ]; then - BINARIES_SUFFIX=aarch64-unknown-linux-gnu - fi - wget -O - $ROOT-$BINARIES_SUFFIX.tar.gz | tar -x -z --strip-components=1 - ./install.sh --prefix=/usr --destdir=$CRAFT_STAGE ################################################################################ rpi-support-binaries: plugin: nil