[PATCH nixpkgs] spectrumPackages.spectrum-vm: fix without Wayland
This errored because of the undefined XDG_RUNTIME_DIR or WAYLAND_DISPLAY. I'd tried to prevent that by disabling -e around this part, but it turns out I should have disabled -u instead. --- pkgs/os-specific/linux/spectrum/spectrum-vm/spectrum-vm.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/spectrum/spectrum-vm/spectrum-vm.in b/pkgs/os-specific/linux/spectrum/spectrum-vm/spectrum-vm.in index 4fa0287a805..8d95c178689 100755 --- a/pkgs/os-specific/linux/spectrum/spectrum-vm/spectrum-vm.in +++ b/pkgs/os-specific/linux/spectrum/spectrum-vm/spectrum-vm.in @@ -55,7 +55,7 @@ do esac done -set +e +set +u if [ -n "$XDG_RUNTIME_DIR" ] then set -- -s "$XDG_RUNTIME_DIR" "$@" @@ -63,7 +63,7 @@ then then set -- --wayland-sock "$XDG_RUNTIME_DIR/$WAYLAND_DISPLAY" "$@" fi fi -set -e +set -u exec "$crosvm" run \ -p init=/sbin/init \ -- 2.30.0
On Mon, Mar 15, 2021 at 01:55:39PM +0000, Alyssa Ross wrote:
This errored because of the undefined XDG_RUNTIME_DIR or WAYLAND_DISPLAY. I'd tried to prevent that by disabling -e around this part, but it turns out I should have disabled -u instead. --- pkgs/os-specific/linux/spectrum/spectrum-vm/spectrum-vm.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Just realised I already posted this patch[1] (and Cole reviewed it). I just never committed it. Oops [1]: https://spectrum-os.org/lists/archives/spectrum-devel/20200825164808.8707-1-...
participants (1)
-
Alyssa Ross