Skip to content

Commit b347d7d

Browse files
committed
update flatpak manifest
1 parent 7fae82a commit b347d7d

File tree

3 files changed

+25
-15
lines changed

3 files changed

+25
-15
lines changed

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
/tests
44
/flatpak-builder-tools
55
/.flatpak-builder
6-
/cargo-sources.json
6+
/cargo-sources.json
7+
/flatpak-out

io.github.wiiznokes.cosmic-ext-applet-clipboard-manager.json

+14-7
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
11
{
2-
"app-id": "io.github.wiiznokes.cosmic-ext-applet-clipboard-manager",
2+
"id": "io.github.wiiznokes.cosmic-ext-applet-clipboard-manager",
33
"runtime": "org.freedesktop.Platform",
44
"runtime-version": "24.08",
5+
"base": "com.system76.Cosmic.BaseApp",
6+
"base-version": "stable",
57
"sdk": "org.freedesktop.Sdk",
68
"sdk-extensions": ["org.freedesktop.Sdk.Extension.rust-stable"],
7-
"command": "fan-control",
8-
"finish-args": ["--share=ipc", "--socket=fallback-x11", "--socket=wayland"],
9+
"command": "cosmic-ext-applet-clipboard-manager",
10+
"finish-args": [
11+
"--share=ipc",
12+
"--socket=wayland",
13+
"--talk-name=com.system76.CosmicSettingsDaemon"
14+
],
915
"modules": [
1016
{
11-
"name": "cosmic-ext-applet-clipboard-manager",
17+
"name": "clipboard-manager",
1218
"buildsystem": "simple",
1319
"build-options": {
1420
"env": {
15-
"CARGO_HOME": "/run/build/fan-control/cargo"
21+
"CARGO_HOME": "/run/build/clipboard-manager/cargo"
1622
},
1723
"append-path": "/usr/lib/sdk/rust-stable/bin"
1824
},
@@ -22,8 +28,9 @@
2228
],
2329
"sources": [
2430
{
25-
"type": "dir",
26-
"path": "./"
31+
"type": "git",
32+
"url": "https://github.com/cosmic-utils/clipboard-manager.git",
33+
"commit": "7fae82a7b42592d5ee10fc245e2f01c1de8e3b7e"
2734
},
2835
"./cargo-sources.json"
2936
]

justfile

+9-7
Original file line numberDiff line numberDiff line change
@@ -90,21 +90,23 @@ setup:
9090
sources-gen:
9191
python3 flatpak-builder-tools/cargo/flatpak-cargo-generator.py ./Cargo.lock -o cargo-sources.json
9292

93+
sdk-version := "24.08"
94+
9395
install-sdk:
94-
flatpak remote-add --if-not-exists --user flathub https://flathub.org/repo/flathub.flatpakrepo
95-
flatpak install --noninteractive --user flathub \
96-
org.freedesktop.Platform//23.08 \
97-
org.freedesktop.Sdk//23.08 \
98-
org.freedesktop.Sdk.Extension.rust-stable//23.08 \
99-
org.freedesktop.Sdk.Extension.llvm17//23.08
96+
flatpak remote-add --if-not-exists --user flathub https://flathub.org/repo/flathub.flatpakrepo
97+
flatpak install --noninteractive --user flathub \
98+
org.freedesktop.Platform//{{sdk-version}} \
99+
org.freedesktop.Sdk//{{sdk-version}} \
100+
org.freedesktop.Sdk.Extension.rust-stable//{{sdk-version}} \
101+
org.freedesktop.Sdk.Extension.llvm18//{{sdk-version}}
100102

101103
uninstall-f:
102104
flatpak uninstall io.github.wiiznokes.cosmic-ext-applet-clipboard-manager -y || true
103105

104106
# deps: flatpak-builder git-lfs
105107
build-and-install: uninstall-f
108+
rm -rf flatpak-out || true
106109
flatpak-builder \
107-
--force-clean \
108110
--verbose \
109111
--ccache \
110112
--user --install \

0 commit comments

Comments
 (0)