From c1765eeb037c49978754e7f5d266075e400f0990 Mon Sep 17 00:00:00 2001
From: Miguel Jacq <mig@mig5.net>
Date: Sun, 9 Feb 2025 13:50:26 +1100
Subject: [PATCH] Revert "Use native poetry plugin?:"

This reverts commit 7fe790427b87f3986cf8783a2ce6a97d8641d33c.
---
 snap/snapcraft.yaml | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index b6226f83..fa9f2061 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: onionshare
-base: core22
+base: core24
 version: "2.6.2"
 summary: Securely and anonymously share files, host websites, and chat using Tor
 description: |
@@ -49,14 +49,21 @@ apps:
 parts:
   onionshare-cli:
     source: ./cli
-    plugin: poetry
-    after: [tor, obfs4, snowflake-client, meek-client]
+    plugin: python
+    build-packages:
+      - python3-poetry
+    build-environment:
+      - PATH: /usr/bin:$PATH
+      - PYTHONPATH: ""
     override-pull: |
       craftctl default
+    after: [tor, obfs4, snowflake-client, meek-client]
+    override-build: |
+      poetry install
 
   onionshare:
     source: ./desktop
-    plugin: poetry
+    plugin: python
     build-packages:
       - build-essential
       - libssl-dev
@@ -139,6 +146,10 @@ parts:
       - libxkbfile1
     override-pull: |
       craftctl default
+    override-build: |
+      poetry install
+      sed -i 's|'$CRAFT_PART_INSTALL'/bin/python3|/usr/bin/env python3|g' $CRAFT_PART_INSTALL/bin/onionshare
+      sed -i 's|'$CRAFT_PART_INSTALL'/bin/python3|/usr/bin/env python3|g' $CRAFT_PART_INSTALL/bin/onionshare-cli
     after: [onionshare-cli]
 
   tor: