aboutsummaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorTrial97 <alexandru.tripon97@gmail.com>2023-06-19 12:20:50 +0300
committerTrial97 <alexandru.tripon97@gmail.com>2023-06-19 12:20:50 +0300
commitec063470d76890d865ea68406ebb1a3a40fa14b1 (patch)
tree7cecd533df5f211ec8d8dbe896c99d34bae27cfc /.github
parent6667ff9330cc080ca3c5fc2dd90af6b8420bf3fc (diff)
parent9d22fce53fef7481ad6804aac62c63c4e5411dcc (diff)
downloadPrismLauncher-ec063470d76890d865ea68406ebb1a3a40fa14b1.tar.gz
PrismLauncher-ec063470d76890d865ea68406ebb1a3a40fa14b1.tar.bz2
PrismLauncher-ec063470d76890d865ea68406ebb1a3a40fa14b1.zip
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into mods_txt
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/build.yml6
1 files changed, 4 insertions, 2 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a6a6ecea..90b6cc76 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -250,6 +250,7 @@ jobs:
wget "https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage"
${{ github.workspace }}/.github/scripts/prepare_JREs.sh
+ sudo apt install libopengl0
- name: Add QT_HOST_PATH var (Windows MSVC arm64)
if: runner.os == 'Windows' && matrix.architecture == 'arm64'
@@ -482,7 +483,8 @@ jobs:
cp -r /home/runner/work/PrismLauncher/Qt/${{ matrix.qt_version }}/gcc_64/plugins/iconengines/* ${{ env.INSTALL_APPIMAGE_DIR }}/usr/plugins/iconengines
cp /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 ${{ env.INSTALL_APPIMAGE_DIR }}/usr/lib/
- cp /usr/lib/x86_64-linux-gnu/libssl.so.1.1 ${{ env.INSTALL_APPIMAGE_DIR }}//usr/lib/
+ cp /usr/lib/x86_64-linux-gnu/libssl.so.1.1 ${{ env.INSTALL_APPIMAGE_DIR }}/usr/lib/
+ cp /usr/lib/x86_64-linux-gnu/libOpenGL.so.0* ${{ env.INSTALL_APPIMAGE_DIR }}/usr/lib/
LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${{ env.INSTALL_APPIMAGE_DIR }}/usr/lib"
LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${{ env.INSTALL_APPIMAGE_DIR }}/usr/lib/jvm/java-8-openjdk/lib/amd64/server"
@@ -599,7 +601,7 @@ jobs:
submodules: 'true'
- name: Install nix
if: inputs.build_type == 'Debug'
- uses: cachix/install-nix-action@v21
+ uses: cachix/install-nix-action@v22
with:
install_url: https://nixos.org/nix/install
extra_nix_config: |