From 0e0381fb12bb46abb757bf93b88a48c61443b111 Mon Sep 17 00:00:00 2001
From: Unrud <unrud@outlook.com>
Date: Mon, 25 Jun 2018 06:12:39 +0200
Subject: [PATCH] use golang sdk extension

---
 flatpak/com.github.unrud.RemoteTouchpad.json | 62 ++------------------
 1 file changed, 4 insertions(+), 58 deletions(-)

diff --git a/flatpak/com.github.unrud.RemoteTouchpad.json b/flatpak/com.github.unrud.RemoteTouchpad.json
index f2b220f..b261473 100644
--- a/flatpak/com.github.unrud.RemoteTouchpad.json
+++ b/flatpak/com.github.unrud.RemoteTouchpad.json
@@ -7,68 +7,14 @@
     "rename-appdata-file" : "remote-touchpad.appdata.xml",
     "rename-desktop-file" : "remote-touchpad.desktop",
     "rename-icon" : "remote-touchpad",
+    "sdk-extensions" : [
+        "org.freedesktop.Sdk.Extension.golang"
+    ],
     "finish-args" : [
         "--socket=x11",
         "--share=network"
     ],
-    "build-options" : {
-        "append-path" : "/app/share/go/bin",
-        "env" : {
-        }
-    },
     "modules" : [
-        {
-            "name" : "go-compiler",
-            "sources" : [
-                {
-                    "only-arches" : [
-                        "i386"
-                    ],
-                    "type" : "archive",
-                    "strip-components" : 0,
-                    "url" : "https://dl.google.com/go/go1.10.3.linux-386.tar.gz",
-                    "sha256" : "3d5fe1932c904a01acb13dae07a5835bffafef38bef9e5a05450c52948ebdeb4"
-                },
-                {
-                    "only-arches" : [
-                        "x86_64"
-                    ],
-                    "type" : "archive",
-                    "strip-components" : 0,
-                    "url" : "https://dl.google.com/go/go1.10.3.linux-amd64.tar.gz",
-                    "sha256" : "fa1b0e45d3b647c252f51f5e1204aba049cde4af177ef9f2181f43004f901035"
-                },
-                {
-                    "only-arches" : [
-                        "arm"
-                    ],
-                    "type" : "archive",
-                    "strip-components" : 0,
-                    "url" : "https://dl.google.com/go/go1.10.3.linux-armv6l.tar.gz",
-                    "sha256" : "d3df3fa3d153e81041af24f31a82f86a21cb7b92c1b5552fb621bad0320f06b6"
-                },
-                {
-                    "only-arches" : [
-                        "aarch64"
-                    ],
-                    "type" : "archive",
-                    "strip-components" : 0,
-                    "url" : "https://dl.google.com/go/go1.10.3.linux-arm64.tar.gz",
-                    "sha256" : "355128a05b456c9e68792143801ad18e0431510a53857f640f7b30ba92624ed2"
-                }
-            ],
-            "buildsystem" : "simple",
-            "build-commands" : [
-                "mkdir -p /app/share",
-                "cp -r go /app/share"
-            ],
-            "build-options" : {
-                "no-debuginfo" : true
-            },
-            "cleanup" : [
-                "*"
-            ]
-        },
         {
             "name" : "remote-desktop",
             "sources" : [
@@ -99,7 +45,7 @@
             ],
             "buildsystem" : "simple",
             "build-commands" : [
-                "env GOPATH=\"$(pwd)\" go build github.com/unrud/remote-touchpad",
+                ". /usr/lib/sdk/golang/enable.sh; env GOPATH=\"$(pwd)\" go build github.com/unrud/remote-touchpad",
                 "install -Dm0755 -t /app/bin remote-touchpad",
                 "install -Dm0644 -t /app/share/appdata src/github.com/unrud/remote-touchpad/desktop/remote-touchpad.appdata.xml",
                 "install -Dm0644 -t /app/share/applications src/github.com/unrud/remote-touchpad/desktop/remote-touchpad.desktop",