summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibaud CANALE <thican@thican.net>2024-07-01 06:26:25 +0200
committerNick Sarnie <sarnex@gentoo.org>2024-07-01 13:50:16 -0400
commit62fa660ba6b2d50f754bd203357e8fd6c2f6bd0f (patch)
treec4c6fa1cb65fabfbe221dac73fffe31a743d0a6b /net-im/discord
parentnet-im/discord: fix seccomp test in launcher (diff)
downloadgentoo-62fa660ba6b2d50f754bd203357e8fd6c2f6bd0f.tar.gz
gentoo-62fa660ba6b2d50f754bd203357e8fd6c2f6bd0f.tar.bz2
gentoo-62fa660ba6b2d50f754bd203357e8fd6c2f6bd0f.zip
net-im/discord: enable explicit wayland support
Signed-off-by: Thibaud CANALE <thican@thican.net> Closes: https://github.com/gentoo/gentoo/pull/37381 Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
Diffstat (limited to 'net-im/discord')
-rw-r--r--net-im/discord/discord-0.0.58-r2.ebuild8
-rw-r--r--net-im/discord/files/launcher.sh7
2 files changed, 12 insertions, 3 deletions
diff --git a/net-im/discord/discord-0.0.58-r2.ebuild b/net-im/discord/discord-0.0.58-r2.ebuild
index 2f44019d1175..9c133ac136e6 100644
--- a/net-im/discord/discord-0.0.58-r2.ebuild
+++ b/net-im/discord/discord-0.0.58-r2.ebuild
@@ -93,9 +93,15 @@ src_prepare() {
# USE seccomp in launcher
if use seccomp; then
- sed --in-place --expression '/^SECCOMP=/s/false/true/' \
+ sed --in-place --expression '/^EBUILD_SECCOMP=/s/false/true/' \
"${T}/launcher.sh" || die "sed failed for seccomp"
fi
+
+ # USE wayland in launcher
+ if use wayland; then
+ sed --in-place --expression '/^EBUILD_WAYLAND=/s/false/true/' \
+ "${T}/launcher.sh" || die "sed failed for wayland"
+ fi
}
src_install() {
diff --git a/net-im/discord/files/launcher.sh b/net-im/discord/files/launcher.sh
index 597974d43e0e..2afc0caa50fd 100644
--- a/net-im/discord/files/launcher.sh
+++ b/net-im/discord/files/launcher.sh
@@ -4,10 +4,13 @@
declare -a discord_parameters
-SECCOMP=false
+# Variables set during ebuild configuration
+EBUILD_SECCOMP=false
+EBUILD_WAYLAND=false
-"${SECCOMP}" || discord_parameters+=( --disable-seccomp-filter-sandbox )
+"${EBUILD_SECCOMP}" || discord_parameters+=( --disable-seccomp-filter-sandbox )
+"${EBUILD_WAYLAND}" && \
[[ -n "${WAYLAND_DISPLAY}" ]] && discord_parameters+=(
--enable-features=UseOzonePlatform
--ozone-platform=wayland