apps/zrythm/Containerfile

@@ -16,7 +16,7 @@ WORKDIR /src
 # carla-git (TODO: Remove temporary workaround)
 RUN git clone https://aur.archlinux.org/carla-git.git && \
       cd carla-git && sed -i 's/$_name.git/$_name.git#commit=a580473fbca5b1a14af45518e4d4fbfeabef8b6e/' PKGBUILD && \
-      sudo pacman -Rdd --noconfirm carla && makepkg --noconfirm -sci
+      makepkg --noconfirm -sci
 
 # libaudec
 RUN git clone https://aur.archlinux.org/libaudec.git && \
@@ -52,7 +52,6 @@ RUN sudo rm -rf /src
 RUN sudo dbus-uuidgen --ensure
 
 LABEL net.typeblog.dobu.desktop_file_path=/usr/share/applications/org.zrythm.Zrythm.desktop
-LABEL net.typeblog.dobu.x11_required=true
 
 # A dbus daemon is required for Zrythm
 # It does not have to share the host one though; launching any random dbus daemon would work

dobu-run.sh

@@ -57,11 +57,13 @@ if is_in_array "$1" "${DISPLAY_SERVER_APP_ALLOWLIST[@]}"; then
 
   WAYLAND_SRC="${XDG_RUNTIME_DIR}/${WAYLAND_DISPLAY}"
   
-  if [ ! -z "$DISPLAY" ]; then
-    XORG_SRC="/tmp/.X11-unix/X${DISPLAY/:/}"
+  if [ -z "$DISPLAY" ]; then
+    # TODO: Maybe we can just ignore Xorg in these cases
+    die "$$DISPLAY must be set for apps granted full Wayland / Xorg access"
   fi
+  XORG_SRC="/tmp/.X11-unix/X${DISPLAY/:/}"
 
-  if [ ! -S "${XORG_SRC}" ] && [ ! -S "${WAYLAND_SRC}" ]; then
+  if [ ! -S "${XORG_SRC}" ] || [ ! -S "${WAYLAND_SRC}" ]; then
     die "Wayland / Xorg sockets do not exist"
   fi
 else