Skip to content

feat(flatpak): work around nvidia driver compatibility by setting WEBKIT_DISABLE_DMABUF_RENDERER=1 #742

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(flatpak): work around nvidia driver compatibility by setting WEBKIT_DISABLE_DMABUF_RENDERER=1 #742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/build-gui-release-binaries.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,8 @@ jobs:
"type": "file",
"path": $deb_path
} |
.modules[0].sources[1].path = $PWD + "/" + .modules[0].sources[1].path
.modules[0].sources[1].path = $PWD + "/" + .modules[0].sources[1].path |
.modules[0].sources[2].path = $PWD + "/" + .modules[0].sources[2].path
' < flatpak/org.eigenwallet.app.json > target/manifest.json

outdir=target/flatpak-repo
Expand Down
3 changes: 2 additions & 1 deletion dev-scripts/publish_flatpak.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,8 @@ jq --arg deb_path "$DEB_FILE" --arg PWD "$PWD" '
"type": "file",
"path": $deb_path
} |
.modules[0].sources[1].path = $PWD + "/" + .modules[0].sources[1].path
.modules[0].sources[1].path = $PWD + "/" + .modules[0].sources[1].path |
.modules[0].sources[2].path = $PWD + "/" + .modules[0].sources[2].path
' "$MANIFEST_FILE" > "$TEMP_MANIFEST"

MANIFEST_FILE="$TEMP_MANIFEST"
Expand Down
7 changes: 6 additions & 1 deletion flatpak/org.eigenwallet.app.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"runtime": "org.gnome.Platform",
"runtime-version": "47",
"sdk": "org.gnome.Sdk",
"command": "unstoppableswap-gui-rs",
"command": "unstoppableswap-gui-rs.flatpak.sh",
"finish-args": [
"--socket=wayland",
"--socket=fallback-x11",
Expand All @@ -28,12 +28,17 @@
{
"type": "file",
"path": "flatpak/org.eigenwallet.app.appdata.xml"
},
{
"type": "file",
"path": "flatpak/unstoppableswap-gui-rs.flatpak.sh"
}
],
"build-commands": [
"ar -x *.deb",
"tar -xf data.tar.gz",
"install -Dm755 usr/bin/unstoppableswap-gui-rs -t /app/bin",
"install -Dm755 *.flatpak.sh -t /app/bin",
"install -Dm644 *.appdata.xml -t /app/share/metainfo",
"mv usr/share/icons /app/share"
]
Expand Down
9 changes: 9 additions & 0 deletions flatpak/unstoppableswap-gui-rs.flatpak.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/sh -x

# Work around https://github.com/eigenwallet/core/issues/665
WEBKIT_DISABLE_DMABUF_RENDERER=1
export WEBKIT_DISABLE_DMABUF_RENDERER

# This executed in flatpak, with /app/bin in $PATH
# flatpak runs execlp("${manifest.command}"), replicate this
exec unstoppableswap-gui-rs "$@"