diff --git a/discover/wrapper.sh b/discover/wrapper.sh deleted file mode 100644 --- a/discover/wrapper.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -XDG_DATA_HOME=~/.local/share/ plasma-discover - diff --git a/org.kde.discover.json b/org.kde.discover.json --- a/org.kde.discover.json +++ b/org.kde.discover.json @@ -4,7 +4,7 @@ "runtime": "org.kde.Platform", "runtime-version": "5.11", "sdk": "org.kde.Sdk", - "command": "/app/bin/discoverwrapper.sh", + "command": "/app/bin/plasma-discover.run", "tags": ["nightly"], "desktop-file-name-suffix": " (Nightly)", "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--device=dri", "--share=network", @@ -130,29 +130,22 @@ } ] }, - { - "name": "wrapper", - "buildsystem": "simple", - "build-commands": [ - "install -m775 discoverwrapper.sh ${FLATPAK_DEST}/bin" - ], - "sources": [ - { - "type": "file", - "path": "discover/wrapper.sh", - "dest-filename": "discoverwrapper.sh" - } - ] - }, + { "name": "discover", "config-opts": ["-DENABLE_TESTING=OFF" , "-DBUILD_SnapBackend=OFF", "-DBUILD_DummyBackend=ON"], "buildsystem": "cmake-ninja", "builddir": true, "sources": [ - { "type": "git", "url": "git://anongit.kde.org/discover.git" } + { "type": "git", "url": "git://anongit.kde.org/discover.git" }, + { + "type": "script", + "dest-filename": "plasma-discover.run", + "commands": [ "FLATPAK_USER_DIR=~/.local/share/flatpak exec plasma-discover" ] + } ], + "post-install": [ "install ../plasma-discover.run /app/bin/" ], "modules-not-building": [ { "name": "snapd-glib",