Merge pull request #93625 from NixOS/f/qemu

qemu: drop invalid and redundant qemu.desktop
This commit is contained in:
Peter Hoeg 2020-07-27 21:36:09 +08:00 committed by GitHub
commit 3ba617416c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 9 deletions

View File

@ -133,15 +133,18 @@ stdenv.mkDerivation rec {
dontWrapGApps = true; dontWrapGApps = true;
postFixup = '' postFixup = ''
# copy qemu-ga (guest agent) to separate output # the .desktop is both invalid and pointless
mkdir -p $ga/bin rm $out/share/applications/qemu.desktop
cp $out/bin/qemu-ga $ga/bin/
'' + optionalString gtkSupport '' # copy qemu-ga (guest agent) to separate output
# wrap GTK Binaries mkdir -p $ga/bin
for f in $out/bin/qemu-system-*; do cp $out/bin/qemu-ga $ga/bin/
wrapGApp $f '' + optionalString gtkSupport ''
done # wrap GTK Binaries
''; for f in $out/bin/qemu-system-*; do
wrapGApp $f
done
'';
# Add a qemu-kvm wrapper for compatibility/convenience. # Add a qemu-kvm wrapper for compatibility/convenience.
postInstall = '' postInstall = ''