pyrox.dev
Merge pull request #312241 from tpwrules/bwrap-better-display
buildFHSEnvBubblewrap: allow more varied $DISPLAY syntax
+4
-2
pkgs/build-support/build-fhsenv-bubblewrap/default.nix
+4
-2
pkgs/build-support/build-fhsenv-bubblewrap/default.nix
···
196
x11_args+=(--tmpfs /tmp/.X11-unix)
197
198
# Try to guess X socket path. This doesn't cover _everything_, but it covers some things.
199
-
if [[ "$DISPLAY" == :* ]]; then
200
-
display_nr=''${DISPLAY#?}
201
local_socket=/tmp/.X11-unix/X$display_nr
202
x11_args+=(--ro-bind-try "$local_socket" "$local_socket")
203
fi
···
196
x11_args+=(--tmpfs /tmp/.X11-unix)
197
198
# Try to guess X socket path. This doesn't cover _everything_, but it covers some things.
199
+
if [[ "$DISPLAY" == *:* ]]; then
200
+
# recover display number from $DISPLAY formatted [host]:num[.screen]
201
+
display_nr=''${DISPLAY/#*:} # strip host
202
+
display_nr=''${display_nr/%.*} # strip screen
203
local_socket=/tmp/.X11-unix/X$display_nr
204
x11_args+=(--ro-bind-try "$local_socket" "$local_socket")
205
fi