From d56e844deee1a32aa0697ab5e65849753537d70b Mon Sep 17 00:00:00 2001
From: Micah Lee <micah@micahflee.com>
Date: Tue, 4 Oct 2022 11:01:29 -0700
Subject: [PATCH] Snapcraft: Try rearranging

---
 snap/snapcraft.yaml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 76b3829b..0aa62a1d 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -115,20 +115,24 @@ parts:
       - qtwayland5
     after: [onionshare-cli]
 
-  onionshare-cli:
+onionshare-cli:
     source: ./cli
     plugin: python
-    stage-packages:
+    build-packages:
       - build-essential
       - libssl-dev
       - libffi-dev
       - python3-dev
       - python3-pip
+      - python3-setuptools
+    stage-packages:
+      - python3-pip
+      - python3-setuptools
     override-build: |
-      python3 -m pip install poetry setuptools
-      python3 -m poetry install
-      python3 -m poetry build
-      python3 -m pip install ./dist/onionshare_cli-*.whl --prefix $SNAPCRAFT_PART_INSTALL
+      pip3 install poetry
+      poetry install
+      poetry build
+      pip3 install ./dist/onionshare_cli-*.whl --prefix $SNAPCRAFT_PART_INSTALL
     after: [tor, obfs4, snowflake-client, meek-client]
 
   tor: