diff options
| -rw-r--r-- | .github/workflows/build.yml | 2 | ||||
| -rw-r--r-- | nix/default.nix | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 022a04f8..ae683795 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -563,7 +563,7 @@ jobs: submodules: 'true' - name: Build Flatpak (Linux) if: inputs.build_type == 'Debug' - uses: flatpak/flatpak-github-actions/flatpak-builder@v5 + uses: flatpak/flatpak-github-actions/flatpak-builder@v6 with: bundle: "Prism Launcher.flatpak" manifest-path: flatpak/org.prismlauncher.PrismLauncher.yml diff --git a/nix/default.nix b/nix/default.nix index 6d4f3f24..cd782f90 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -2,6 +2,7 @@ lib, stdenv, cmake, + ninja, jdk8, jdk17, zlib, @@ -33,7 +34,7 @@ stdenv.mkDerivation rec { src = lib.cleanSource self; - nativeBuildInputs = [extra-cmake-modules cmake file jdk17 wrapQtAppsHook]; + nativeBuildInputs = [extra-cmake-modules cmake file jdk17 ninja wrapQtAppsHook]; buildInputs = [ qtbase |