diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-09-24 07:21:46 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-09-25 08:21:19 +0000 |
| commit | 16db4a0f578112172f7103c10a84b8199c3c1dab (patch) | |
| tree | c0a42430bed3c368c8fd83bbeb5deed4f8f961e2 | |
| parent | 94ddba21a2221b2e8bc80c0b1cbbc904abc302b7 (diff) | |
| download | spectrum-16db4a0f578112172f7103c10a84b8199c3c1dab.tar spectrum-16db4a0f578112172f7103c10a84b8199c3c1dab.tar.gz spectrum-16db4a0f578112172f7103c10a84b8199c3c1dab.tar.bz2 spectrum-16db4a0f578112172f7103c10a84b8199c3c1dab.tar.lz spectrum-16db4a0f578112172f7103c10a84b8199c3c1dab.tar.xz spectrum-16db4a0f578112172f7103c10a84b8199c3c1dab.tar.zst spectrum-16db4a0f578112172f7103c10a84b8199c3c1dab.zip | |
vm: remove mesa drivers
This includes a revert of commit 1a754374028ced6eea2dd77a2f829b511d2e90ba. vm-lib/make-vm.nix was not the right place for the Mesa drivers to be added — it meant that every VM had its own copy of the drivers, whether it used them or not. And right now, nothing uses the Mesa drivers. This will only be the case if we do GPU passthrough at some point. When that happens, we can add them in a more sensible way, in img/app. Signed-off-by: Alyssa Ross <hi@alyssa.is>
| -rw-r--r-- | vm-lib/make-vm.nix | 3 | ||||
| -rw-r--r-- | vm/app/hello-wayland.nix | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/vm-lib/make-vm.nix b/vm-lib/make-vm.nix index c3533ec..82b1d03 100644 --- a/vm-lib/make-vm.nix +++ b/vm-lib/make-vm.nix @@ -36,8 +36,7 @@ runCommand "spectrum-vm" { mkdir -p "$out"/{blk,providers,shared-dirs} ${../scripts/make-erofs.sh} -L ext -- "$out/blk/run.img" ${run} run \ - ${pkgs.pkgsMusl.mesa.drivers} / \ - $(comm -23 <(sort ${writeReferencesToFile run} ${writeReferencesToFile pkgs.pkgsMusl.mesa.drivers}) \ + $(comm -23 <(sort ${writeReferencesToFile run}) \ <(sort ${writeReferencesToFile basePaths}) | sed p) pushd "$out" diff --git a/vm/app/hello-wayland.nix b/vm/app/hello-wayland.nix index e10f05e..40baf24 100644 --- a/vm/app/hello-wayland.nix +++ b/vm/app/hello-wayland.nix @@ -10,7 +10,6 @@ import ../make-vm.nix { inherit config; } { { writeScript, hello-wayland }: writeScript "run-hello-wayland" '' #!/bin/execlineb -P - foreground { ln -ns /run/ext /run/opengl-driver } foreground { mkdir /run/user } foreground { umask 077 |