diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-04-22 16:46:27 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-04-22 17:04:08 +0000 |
| commit | b3c3a315f2583bcd6b95bd6964e7760456cadc6d (patch) | |
| tree | 8dee7f87fd971f0ea6d1515933912066d73ac0ff /pkgs/os-specific/linux/spectrum | |
| parent | 817a1a9b0de30d8bbc2ad2e80a802d87c56e96ff (diff) | |
| download | nixpkgs-b3c3a315f2583bcd6b95bd6964e7760456cadc6d.tar nixpkgs-b3c3a315f2583bcd6b95bd6964e7760456cadc6d.tar.gz nixpkgs-b3c3a315f2583bcd6b95bd6964e7760456cadc6d.tar.bz2 nixpkgs-b3c3a315f2583bcd6b95bd6964e7760456cadc6d.tar.lz nixpkgs-b3c3a315f2583bcd6b95bd6964e7760456cadc6d.tar.xz nixpkgs-b3c3a315f2583bcd6b95bd6964e7760456cadc6d.tar.zst nixpkgs-b3c3a315f2583bcd6b95bd6964e7760456cadc6d.zip | |
spectrumPackages.spectrum-vm: fix with no wayland
We can abuse $@ to be a sort of array where we can put a number of values, without losing quoting information or having to escape.
Diffstat (limited to 'pkgs/os-specific/linux/spectrum')
| -rwxr-xr-x | pkgs/os-specific/linux/spectrum/spectrum-vm/spectrum-vm.in | 14 |
1 files changed, 11 insertions, 3 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 97cb5dbfa58..7c653da12f4 100755 --- a/pkgs/os-specific/linux/spectrum/spectrum-vm/spectrum-vm.in +++ b/pkgs/os-specific/linux/spectrum/spectrum-vm/spectrum-vm.in @@ -58,9 +58,17 @@ if [ "$#" -ne 0 ]; then ex_usage 1 >&2 fi -exec "$crosvm" run \ - --wayland-sock "$XDG_RUNTIME_DIR/$WAYLAND_DISPLAY" \ - -s "$XDG_RUNTIME_DIR" \ +set +e +if [ -n "$XDG_RUNTIME_DIR" ] +then + set -- -s "$XDG_RUNTIME_DIR" + if [ -n "$WAYLAND_DISPLAY" ] + then set -- "$@" --wayland-sock "$XDG_RUNTIME_DIR/$WAYLAND_DISPLAY" + fi +fi +set -e + +exec "$crosvm" run "$@" \ -p init=/sbin/init \ -p "spectrumcmd=$(printf %s "$command" | base64)" \ --root "$rootfs" \ |