From e54fffccdfadf97892b070fd18fa0476b0733ed9 Mon Sep 17 00:00:00 2001
From: Christopher James Halse Rogers <raof@ubuntu.com>
Date: Fri, 20 Sep 2019 09:26:04 +0200
Subject: [PATCH] snap: *Another* fix for building (#668)

---
 snap/snapcraft.yaml | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 35e2899..9b9463f 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -31,10 +31,10 @@ parts:
       - pkg-config
       - libsqlite3-dev
       - gettext
-    after:
-      - cargo-web
     override-build: |
-      export PATH=$PATH:$SNAPCRAFT_PROJECT_DIR/../.cargo/bin
+      export PATH=$PATH:$HOME/.cargo/bin
+      rustup install stable
+      cargo +stable install cargo-web
       cargo web deploy -p plume-front --release
       cargo install --force --no-default-features --features sqlite --path . --root ${SNAPCRAFT_PART_INSTALL}
       cargo install --force --no-default-features --features sqlite --path plume-cli --root ${SNAPCRAFT_PART_INSTALL}
@@ -43,11 +43,3 @@ parts:
     stage-packages:
       - openssl
       - libsqlite3-0
-
-  cargo-web:
-    plugin: rust
-    source: https://github.com/koute/cargo-web.git
-    source-tag: 0.6.26
-    override-pull: |
-        printf "\n[Workspace]\n" >> ${SNAPCRAFT_PART_SRC}/Cargo.toml
-        snapcraftctl pull