From 6134fa564be48ff0998144c1f6d06705d48ca0ce Mon Sep 17 00:00:00 2001
From: Unrud <unrud@outlook.com>
Date: Mon, 20 Jun 2022 01:19:00 +0200
Subject: [PATCH] Flatpak: Generate vendor/modules.txt

---
 flatpak/com.github.unrud.RemoteTouchpad.yaml | 12 +++++-------
 flatpak/modules.txt                          | 11 -----------
 2 files changed, 5 insertions(+), 18 deletions(-)
 delete mode 100644 flatpak/modules.txt

diff --git a/flatpak/com.github.unrud.RemoteTouchpad.yaml b/flatpak/com.github.unrud.RemoteTouchpad.yaml
index ff7790c..5ae6aa3 100644
--- a/flatpak/com.github.unrud.RemoteTouchpad.yaml
+++ b/flatpak/com.github.unrud.RemoteTouchpad.yaml
@@ -12,7 +12,11 @@ finish-args:
 modules:
   - name: remote-touchpad
     sources:
-      # Vendor dependencies: go mod vendor -v
+      - type: git
+        path: ..
+      - type: shell
+        commands:
+          - . /usr/lib/sdk/golang/enable.sh; go mod vendor -e
       - type: git
         url: https://github.com/godbus/dbus
         tag: v5.0.6
@@ -26,12 +30,6 @@ modules:
         url: https://github.com/golang/net
         commit: cd36cc0744dd695657988f15f08446dc81e16efc
         dest: vendor/golang.org/x/net
-      - type: file
-        path: modules.txt
-        dest: vendor
-      - type: git
-        path: ..
-        branch: master
     buildsystem: simple
     build-commands:
       - . /usr/lib/sdk/golang/enable.sh; go build -tags portal,x11
diff --git a/flatpak/modules.txt b/flatpak/modules.txt
deleted file mode 100644
index dcee2b0..0000000
--- a/flatpak/modules.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-# github.com/godbus/dbus/v5 v5.0.6
-## explicit
-github.com/godbus/dbus/v5
-# github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
-## explicit
-github.com/skip2/go-qrcode
-github.com/skip2/go-qrcode/bitset
-github.com/skip2/go-qrcode/reedsolomon
-# golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd
-## explicit
-golang.org/x/net/websocket