From 665bb90fc3f6c39cfb290ecc100b3433082e5d64 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 9 Apr 2022 17:29:04 +0000 Subject: qemu: remove redundant copy of qemu-ga There's no reason to have one copy of qemu-ga in $out and another in $ga, and because we only applied remove-references-to to one of the copies, it caused a collision when QEMU was used in a buildEnv. --- pkgs/applications/virtualization/qemu/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 954fd3f051a9..68082f5de41b 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -234,9 +234,10 @@ stdenv.mkDerivation rec { # the .desktop is both invalid and pointless rm -f $out/share/applications/qemu.desktop - # copy qemu-ga (guest agent) to separate output + # move qemu-ga (guest agent) to separate output mkdir -p $ga/bin - cp $out/bin/qemu-ga $ga/bin/ + mv $out/bin/qemu-ga $ga/bin/ + ln -s $ga/bin/qemu-ga $out/bin remove-references-to -t $out $ga/bin/qemu-ga '' + lib.optionalString gtkSupport '' # wrap GTK Binaries -- cgit 1.4.1