BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

qemu: remove redundant copy of qemu-ga

Browse source 
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.
This commit is contained in:
Alyssa Ross 2022-04-09 17:29:04 +00:00 committed by Peter Hoeg
parent 797fdd3859
commit 665bb90fc3
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/applications/virtualization/qemu/default.nix
View file

@ -234,9 +234,10 @@ stdenv.mkDerivation rec {
# the .desktop is both invalid and pointless # the .desktop is both invalid and pointless
rm -f $out/share/applications/qemu.desktop 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 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 remove-references-to -t $out $ga/bin/qemu-ga
'' + lib.optionalString gtkSupport '' '' + lib.optionalString gtkSupport ''
# wrap GTK Binaries # wrap GTK Binaries