diff --git a/flake.nix b/flake.nix index 3d51203..c544235 100644 --- a/flake.nix +++ b/flake.nix @@ -71,6 +71,7 @@ python313Packages.tomlkit python313Packages.pip unzip + appstream libcosmicAppHook ]; diff --git a/justfile b/justfile index 0426446..6d368e3 100644 --- a/justfile +++ b/justfile @@ -75,9 +75,13 @@ install-flatpak-builder-tools: flatpak-gen-manifest: install-flatpak-builder-tools python3 flatpak-builder-tools/cargo/flatpak-cargo-generator.py Cargo.lock -o cargo-sources.json + python3 flatpak-builder-tools/cargo/flatpak-cargo-generator.py mupdf/Cargo.lock -o mupdf-cargo-sources.json flatpak-build: flatpak-builder --install --user --force-clean build-dir xyz.cochrun.lumina.yml +flatpak-shell: + flatpak-builder --run build-dir xyz.cochrun.lumina.yml sh + alias fb := flatpak-build alias fs := flatpak-setup diff --git a/res/xyz.cochrun.lumina.desktop b/res/xyz.cochrun.lumina.desktop index 460405c..d5f9101 100644 --- a/res/xyz.cochrun.lumina.desktop +++ b/res/xyz.cochrun.lumina.desktop @@ -4,7 +4,7 @@ Type=Application Name=Lumina Comment=A church presentation app that is built to be simple to use. -Categories=Office;AudioVideo;Player; +Categories=Graphics; Icon=lumina Exec=lumina -i diff --git a/res/xyz.cochrun.lumina.metainfo.xml b/res/xyz.cochrun.lumina.metainfo.xml index d3a4416..0f7642d 100644 --- a/res/xyz.cochrun.lumina.metainfo.xml +++ b/res/xyz.cochrun.lumina.metainfo.xml @@ -17,13 +17,13 @@ xyz.cochrun.lumina.desktop - https://git.tfcconnection.org/chris/lumina/raw/branch/master/res/images/screenshot_2026-04-10_15-34-28.png + https://git.tfcconnection.org/chris/lumina/raw/branch/master/res/images/screenshot_2026-05-03_08-16-59.png - https://git.tfcconnection.org/chris/lumina/raw/branch/master/res/images/screenshot_2026-04-10_15-34-55.png + https://git.tfcconnection.org/chris/lumina/raw/branch/master/res/images/screenshot_2026-05-03_08-23-08.png - https://git.tfcconnection.org/chris/lumina/raw/branch/master/res/images/screenshot_2026-04-10_15-35-14.png + https://git.tfcconnection.org/chris/lumina/raw/branch/master/res/images/screenshot_2026-05-03_08-23-23.png diff --git a/xyz.cochrun.lumina.yml b/xyz.cochrun.lumina.yml index 35196e0..9e6f13d 100644 --- a/xyz.cochrun.lumina.yml +++ b/xyz.cochrun.lumina.yml @@ -3,7 +3,7 @@ runtime: org.freedesktop.Platform runtime-version: '25.08' sdk: org.freedesktop.Sdk sdk-extensions: - - org.freedesktop.Sdk.Extension.rust-nightly + - org.freedesktop.Sdk.Extension.rust-stable - org.freedesktop.Sdk.Extension.llvm22 base: com.system76.Cosmic.BaseApp command: lumina -i @@ -15,7 +15,32 @@ finish-args: - --share=network - --filesystem=xdg-documents - --filesystem=xdg-config/cosmic:rw + - --filesystem=xdg-data/lumina:rw + - --filesystem=xdg-cache/lumina:rw +build-options: + append-path: /usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm22/bin + # append-path: /usr/lib/sdk/llvm22/bin + prepend-ld-library-path: /usr/lib/sdk/llvm22/lib + env: + CARGO_HOME: /run/build/lumina/cargo + LIBCLANG_PATH: /usr/lib/sdk/llvm22/lib + BINDGEN_EXTRA_CLANG_ARGS: -I/usr/lib/sdk/llvm22/lib/clang/22/include + PKG_CONFIG_PATH: /app/lib64/pkgconfig:/app/lib/pkgconfig:/app/share/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig + DATABASE_URL: sqlite://./test.db + # CC: gcc + # CXX: g++ + # CARGO_NET_OFFLINE: 'true' modules: + # - name: mupdf-rs + # buildsystem: simple + # build-commands: + # - cargo build --offline --release + # sources: + # - type: git + # url: https://github.com/messense/mupdf-rs.git + # commit: 902d44bf7becfc84f8349c524cb8acfb18a6f3d4 + # - mupdf-cargo-sources.json + - name: lumina buildsystem: simple build-options: