diff --git a/de.johrpan.Musicus.Devel.json b/flatpak/de.johrpan.Musicus.Devel.json similarity index 98% rename from de.johrpan.Musicus.Devel.json rename to flatpak/de.johrpan.Musicus.Devel.json index 1360780..07cabd6 100644 --- a/de.johrpan.Musicus.Devel.json +++ b/flatpak/de.johrpan.Musicus.Devel.json @@ -51,7 +51,7 @@ "sources": [ { "type": "dir", - "path": "." + "path": ".." } ] } diff --git a/flatpak/de.johrpan.Musicus.json b/flatpak/de.johrpan.Musicus.json new file mode 100644 index 0000000..3ddfaaa --- /dev/null +++ b/flatpak/de.johrpan.Musicus.json @@ -0,0 +1,59 @@ +{ + "id": "de.johrpan.Musicus", + "runtime": "org.gnome.Platform", + "runtime-version": "48", + "sdk": "org.gnome.Sdk", + "sdk-extensions": [ + "org.freedesktop.Sdk.Extension.rust-stable", + "org.freedesktop.Sdk.Extension.llvm18" + ], + "command": "musicus", + "finish-args": [ + "--share=ipc", + "--share=network", + "--socket=fallback-x11", + "--socket=wayland", + "--socket=pulseaudio", + "--device=dri", + "--env=RUST_LOG=musicus=debug", + "--env=RUST_BACKTRACE=1", + "--env=G_MESSAGES_DEBUG=none" + ], + "build-options": { + "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm18/bin", + "build-args": [ + "--share=network" + ], + "env": { + "CARGO_REGISTRIES_CRATES_IO_PROTOCOL": "sparse", + "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER": "clang", + "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS": "-C link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold" + } + }, + "modules": [ + { + "name": "blueprint-compiler", + "buildsystem": "meson", + "sources": [ + { + "type": "git", + "url": "https://gitlab.gnome.org/jwestman/blueprint-compiler.git", + "tag": "v0.16.0" + } + ] + }, + { + "name": "musicus", + "buildsystem": "meson", + "config-opts": [ + "-Dprofile=release" + ], + "sources": [ + { + "type": "dir", + "path": ".." + } + ] + } + ] +} diff --git a/src/meson.build b/src/meson.build index bbf3f68..1dbe4c8 100644 --- a/src/meson.build +++ b/src/meson.build @@ -34,7 +34,7 @@ cargo_opt += [ '--target-dir', meson.project_build_root() / 'src' ] cargo_env = [ 'CARGO_HOME=' + meson.project_build_root() / 'cargo-home' ] if get_option('profile') == 'release' - cargo_options += [ '--release' ] + cargo_opt += [ '--release' ] rust_target = 'release' message('Building in release mode') else