Skip to content

Commit

Permalink
Revert "gnome.gnome-boxes: add qemu to path"
Browse files Browse the repository at this point in the history
Boxes insert the absolute path of `qemu-system-x86_64` program
as found on `PATH` into the `<emulator>` element of the libvirt
config. But if we add qemu to `PATH` using a wrapper, the saved
path will point directly to a store path, which will break when
the store path is garbage collected.

Let’s drop it again so that qemu can be picked up from the environment
using a more stable path such as `/run/libvirt/nix-emulators/qemu-system-x86_64`
introduced by the `virtualisation.libvirtd.enable = true;` NixOS option.

This reverts commit ba1ecbe,
essentially re-applying 1203370.

Fixes: #57931
  • Loading branch information
jtojnar committed Sep 29, 2022
1 parent 1130e29 commit 7ccc6ab
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions pkgs/desktops/gnome/apps/gnome-boxes/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
, vte
, glib-networking
, qemu-utils
, qemu
}:

stdenv.mkDerivation rec {
Expand Down Expand Up @@ -126,7 +125,7 @@ stdenv.mkDerivation rec {
];

preFixup = ''
gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ mtools cdrkit libcdio qemu-utils qemu ]}")
gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ mtools cdrkit libcdio qemu-utils ]}")
'';

postPatch = ''
Expand Down

0 comments on commit 7ccc6ab

Please sign in to comment.