diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-09-25 11:16:11 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-09-25 11:16:11 +0000 |
| commit | 6b51efa36ffe557c5720e06a927c488194bdbcf8 (patch) | |
| tree | 9b9e3d78afd0c8c1b0859c3e34468fab1212a5c3 | |
| parent | c4d483799ed893449534d0b5a548e8b33b80b8b4 (diff) | |
| download | spectrum-6b51efa36ffe557c5720e06a927c488194bdbcf8.tar spectrum-6b51efa36ffe557c5720e06a927c488194bdbcf8.tar.gz spectrum-6b51efa36ffe557c5720e06a927c488194bdbcf8.tar.bz2 spectrum-6b51efa36ffe557c5720e06a927c488194bdbcf8.tar.lz spectrum-6b51efa36ffe557c5720e06a927c488194bdbcf8.tar.xz spectrum-6b51efa36ffe557c5720e06a927c488194bdbcf8.tar.zst spectrum-6b51efa36ffe557c5720e06a927c488194bdbcf8.zip | |
vm/app/hello-wayland.nix: remove
This was useful while it was the only Wayland client we could run, but since it doesn't start reliably[1], and we can now run complex clients, appvm-hello-wayland isn't really providing value any more. [1]: https://github.com/emersion/hello-wayland/pull/19 Signed-off-by: Alyssa Ross <hi@alyssa.is>
| -rw-r--r-- | host/initramfs/extfs.nix | 4 | ||||
| -rw-r--r-- | vm/app/hello-wayland.nix | 28 |
2 files changed, 1 insertions, 31 deletions
diff --git a/host/initramfs/extfs.nix b/host/initramfs/extfs.nix index dd29866..8034aea 100644 --- a/host/initramfs/extfs.nix +++ b/host/initramfs/extfs.nix @@ -11,7 +11,6 @@ let appvm-catgirl = import ../../vm/app/catgirl.nix { inherit config; }; appvm-foot = import ../../vm/app/foot.nix { inherit config; }; - appvm-hello-wayland = import ../../vm/app/hello-wayland.nix { inherit config; }; appvm-lynx = import ../../vm/app/lynx.nix { inherit config; }; appvm-mg = import ../../vm/app/mg.nix { inherit config; }; in @@ -19,7 +18,7 @@ in runCommand "ext.ext4" { nativeBuildInputs = [ e2fsprogs ]; } '' - mkdir -p root/svc/data/appvm-{catgirl,foot,hello-wayland,lynx,mg} + mkdir -p root/svc/data/appvm-{catgirl,foot,lynx,mg} cd root tar -C ${netvm} -c data | tar -C svc -x @@ -27,7 +26,6 @@ runCommand "ext.ext4" { tar -C ${appvm-catgirl} -c . | tar -C svc/data/appvm-catgirl -x tar -C ${appvm-foot} -c . | tar -C svc/data/appvm-foot -x - tar -C ${appvm-hello-wayland} -c . | tar -C svc/data/appvm-hello-wayland -x tar -C ${appvm-lynx} -c . | tar -C svc/data/appvm-lynx -x tar -C ${appvm-mg} -c . | tar -C svc/data/appvm-mg -x diff --git a/vm/app/hello-wayland.nix b/vm/app/hello-wayland.nix deleted file mode 100644 index 40baf24..0000000 --- a/vm/app/hello-wayland.nix +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: MIT -# SPDX-FileCopyrightText: 2022 Unikie -# SPDX-FileCopyrightText: 2023 Alyssa Ross <hi@alyssa.is> - -import ../../lib/eval-config.nix ({ config, ... }: - -import ../make-vm.nix { inherit config; } { - wayland = true; - run = config.pkgs.pkgsStatic.callPackage ( - { writeScript, hello-wayland }: - writeScript "run-hello-wayland" '' - #!/bin/execlineb -P - foreground { mkdir /run/user } - foreground { - umask 077 - mkdir /run/user/0 - } - if { /etc/mdev/wait card0 } - export XDG_RUNTIME_DIR /run/user/0 - - # No pkgsStatic.wayland-proxy-virtwl: - # https://github.com/nix-ocaml/nix-overlays/issues/698 - ${config.pkgs.pkgsMusl.wayland-proxy-virtwl}/bin/wayland-proxy-virtwl --virtio-gpu - - ${hello-wayland}/bin/hello-wayland - '' - ) { }; -}) |