From 84944c578d8caf23a7e4ef92e628a647b1ae9ea9 Mon Sep 17 00:00:00 2001
From: Unrud <unrud@outlook.com>
Date: Sun, 13 Sep 2020 10:25:29 +0200
Subject: [PATCH] Snap: Remove workaround

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

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 3098e75..3c2e1a9 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -31,25 +31,21 @@ apps:
 parts:
   remote-touchpad:
     plugin: go
-    go-importpath: github.com/Unrud/remote-touchpad
     go-buildtags:
       - portal
       - x11
     source: .
     source-type: git
     build-packages:
-     - gcc
-     - libc6-dev
-     - libxt-dev
-     - libxtst-dev
+      - gcc
+      - libc6-dev
+      - libxt-dev
+      - libxtst-dev
     stage-packages:
-     - libxt6
-     - libxtst6
+      - libxt6
+      - libxtst6
     override-pull: |
       snapcraftctl pull
-      # WORKAROUND: Snapcraft Go Plugin doesn't set buildtags for go-get
-      GOPATH="$(realpath "${SNAPCRAFT_PART_SRC}/../go")"
-      env --chdir="$GOPATH/src" GOPATH="$GOPATH" go get -t -d -tags portal,x11 ./github.com/Unrud/remote-touchpad/...
       # WORKAROUND: Point icon directly to high resolution version otherwise snapcraft automatically chooses lowest resolution
       sed -e 's|Icon=com.github.unrud.RemoteTouchpad|Icon=/usr/share/icons/hicolor/512x512/apps/com.github.unrud.RemoteTouchpad.png|' -i desktop/com.github.unrud.RemoteTouchpad.desktop
     override-build: |