From c42e12d2bee75a1e87e294e9dcd6dbf165ad8d79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Dzi=C4=99giel?= Date: Sat, 16 Nov 2024 17:13:09 +0100 Subject: [PATCH 1/2] workflows: Update nightly extensions to 24.08 Also change to Rust stable to fix build failing --- .github/workflows/flatpak-nightly.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/flatpak-nightly.yml b/.github/workflows/flatpak-nightly.yml index 68018609..31ffd407 100644 --- a/.github/workflows/flatpak-nightly.yml +++ b/.github/workflows/flatpak-nightly.yml @@ -30,8 +30,8 @@ jobs: platforms: arm64 - name: Prepare Runtime run: | - flatpak --system install -y --noninteractive flathub org.freedesktop.Sdk.Extension.rust-nightly/${{ matrix.arch }}/23.08 - flatpak --system install -y --noninteractive flathub org.freedesktop.Sdk.Extension.llvm16/${{ matrix.arch }}/23.08 + flatpak --system install -y --noninteractive flathub org.freedesktop.Sdk.Extension.rust-stable/${{ matrix.arch }}/24.08 + flatpak --system install -y --noninteractive flathub org.freedesktop.Sdk.Extension.llvm18/${{ matrix.arch }}/24.08 - name: Build uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6 with: From 77ee519f8ce350cb94022474f9d70a459bff0b29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Dzi=C4=99giel?= Date: Sat, 16 Nov 2024 17:14:40 +0100 Subject: [PATCH 2/2] flatpak-nightly: Update manifest Use 24.08 for ffmpeg and switch to Rust stable with added recommended env vars --- .../com.github.rafostar.Clapper-nightly.json | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json b/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json index 2b9090a2..e76f0398 100644 --- a/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json +++ b/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json @@ -4,12 +4,12 @@ "runtime-version": "master", "sdk": "org.gnome.Sdk", "sdk-extensions": [ - "org.freedesktop.Sdk.Extension.rust-nightly", - "org.freedesktop.Sdk.Extension.llvm16" + "org.freedesktop.Sdk.Extension.rust-stable", + "org.freedesktop.Sdk.Extension.llvm18" ], "add-extensions": { "org.freedesktop.Platform.ffmpeg-full": { - "version": "23.08", + "version": "24.08", "directory": "lib/ffmpeg", "add-ld-path": ".", "no-autodownload": false, @@ -34,8 +34,14 @@ "--env=GST_PLUGIN_SYSTEM_PATH=/app/lib/gstreamer-1.0" ], "build-options": { - "append-path": "/usr/lib/sdk/rust-nightly/bin:/usr/lib/sdk/llvm16/bin", - "prepend-ld-library-path": "/usr/lib/sdk/llvm16/lib" + "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm18/bin", + "prepend-ld-library-path": "/usr/lib/sdk/llvm18/lib", + "env": { + "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", + "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER": "clang", + "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUSTFLAGS": "-C link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold" + } }, "modules": [ "flathub/shared-modules/gudev/gudev.json",