Attempt to fix build, merge build-commands and post-install and address some comments
This commit is contained in:
parent
bbe09ca349
commit
aba93223a3
2 changed files with 12 additions and 25 deletions
|
@ -1,5 +1,4 @@
|
||||||
app-id: org.ryujinx.Ryujinx
|
app-id: org.ryujinx.Ryujinx
|
||||||
name: Ryujinx
|
|
||||||
runtime: org.freedesktop.Platform
|
runtime: org.freedesktop.Platform
|
||||||
runtime-version: '21.08'
|
runtime-version: '21.08'
|
||||||
sdk: org.freedesktop.Sdk
|
sdk: org.freedesktop.Sdk
|
||||||
|
|
36
ryujinx.yml
36
ryujinx.yml
|
@ -1,12 +1,4 @@
|
||||||
sources:
|
name: Ryujinx
|
||||||
- nuget_sources.json
|
|
||||||
- type: git
|
|
||||||
url: https://github.com/Ryujinx/Ryujinx.git
|
|
||||||
commit: ac21abbb9d23432879b1026eb5bc48ad3d4583d8
|
|
||||||
- type: file
|
|
||||||
path: ryujinx-wrapper
|
|
||||||
- type: file
|
|
||||||
path: org.ryujinx.Ryujinx.appdata.xml
|
|
||||||
buildsystem: simple
|
buildsystem: simple
|
||||||
build-options:
|
build-options:
|
||||||
append-path: /usr/lib/sdk/dotnet6/bin
|
append-path: /usr/lib/sdk/dotnet6/bin
|
||||||
|
@ -37,23 +29,19 @@ build-commands:
|
||||||
cp -r --remove-destination /run/build/Ryujinx/Ryujinx/bin/Release/net6.0/$RUNTIME/publish/* /app/bin/
|
cp -r --remove-destination /run/build/Ryujinx/Ryujinx/bin/Release/net6.0/$RUNTIME/publish/* /app/bin/
|
||||||
mkdir -p /app/lib/ffmpeg
|
mkdir -p /app/lib/ffmpeg
|
||||||
ln -s /usr/lib/x86_64-linux-gnu/libX11.so.6 /app/lib/libX11.so
|
ln -s /usr/lib/x86_64-linux-gnu/libX11.so.6 /app/lib/libX11.so
|
||||||
post-install:
|
|
||||||
- install -Dm644 $FLATPAK_ID.appdata.xml /app/share/metainfo/$FLATPAK_ID.appdata.xml
|
- install -Dm644 $FLATPAK_ID.appdata.xml /app/share/metainfo/$FLATPAK_ID.appdata.xml
|
||||||
- install -Dm755 ryujinx-wrapper /app/bin/ryujinx-wrapper
|
- install -Dm755 ryujinx-wrapper /app/bin/ryujinx-wrapper
|
||||||
- |
|
- install -Dm644 distribution/linux/ryujinx-logo.svg /app/share/icons/hicolor/scalable/apps/ryujinx.svg
|
||||||
install -Dm644 distribution/linux/ryujinx-logo.svg /app/share/icons/hicolor/scalable/apps/ryujinx.svg
|
- install -m644 distribution/linux/ryujinx-mime.xml /app/share/mime/packages/$FLATPAK_ID.mime.xml
|
||||||
icon_in="distribution/linux/ryujinx-logo.svg";
|
|
||||||
icon_out="ryujinx.png";
|
|
||||||
for s in {16,22,24,32,36,48,64,72,96,128,192,256,512}; do
|
|
||||||
[[ ! -f "/app/share/icons/hicolor/${s}x${s}/apps/${icon_out}" ]] || continue;
|
|
||||||
rsvg-convert "${icon_in}" -w "${s}" -h "${s}" -a -f png -o "${icon_out}";
|
|
||||||
install -p -D -m 0644 "${icon_out}" -t "/app/share/icons/hicolor/${s}x${s}/apps/";
|
|
||||||
done;
|
|
||||||
gtk-update-icon-cache --force --ignore-theme-index /app/share/icons/hicolor
|
|
||||||
- |
|
|
||||||
mkdir -p /app/share/mime/packages/
|
|
||||||
install -m644 distribution/linux/ryujinx-mime.xml /app/share/mime/packages/$FLATPAK_ID.mime.xml
|
|
||||||
update-mime-database /app/share/mime
|
|
||||||
- |
|
- |
|
||||||
install -Dm644 distribution/linux/ryujinx.desktop /app/share/applications/$FLATPAK_ID.desktop
|
install -Dm644 distribution/linux/ryujinx.desktop /app/share/applications/$FLATPAK_ID.desktop
|
||||||
desktop-file-edit --set-key="Exec" --set-value="ryujinx-wrapper %f" /app/share/applications/$FLATPAK_ID.desktop
|
desktop-file-edit --set-key="Exec" --set-value="ryujinx-wrapper %f" /app/share/applications/$FLATPAK_ID.desktop
|
||||||
|
sources:
|
||||||
|
- nuget_sources.json
|
||||||
|
- type: git
|
||||||
|
url: https://github.com/Ryujinx/Ryujinx.git
|
||||||
|
commit: ac21abbb9d23432879b1026eb5bc48ad3d4583d8
|
||||||
|
- type: file
|
||||||
|
path: ryujinx-wrapper
|
||||||
|
- type: file
|
||||||
|
path: org.ryujinx.Ryujinx.appdata.xml
|
||||||
|
|
Loading…
Reference in a new issue