diff options
| author | Peter Hoeg <peter@hoeg.com> | 2020-07-27 21:36:09 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-27 21:36:09 +0800 |
| commit | 3ba617416cd7eb7f2d1872301a653116a6e4c163 (patch) | |
| tree | 8c2c2baad2c627045de1bb7e33855f9d4e72b3cc /pkgs | |
| parent | f1c2f8817b357e15830460e9e6630f1d4e8cf0f0 (diff) | |
| parent | cde67612b2677b2d57f2db15fb233bb1cd67cdae (diff) | |
Merge pull request #93625 from NixOS/f/qemu
qemu: drop invalid and redundant qemu.desktop
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/virtualization/qemu/default.nix | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index c5dcc2fafc689..ada0d96910983 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -133,15 +133,18 @@ stdenv.mkDerivation rec { dontWrapGApps = true; postFixup = '' - # copy qemu-ga (guest agent) to separate output - mkdir -p $ga/bin - cp $out/bin/qemu-ga $ga/bin/ - '' + optionalString gtkSupport '' - # wrap GTK Binaries - for f in $out/bin/qemu-system-*; do - wrapGApp $f - done - ''; + # the .desktop is both invalid and pointless + rm $out/share/applications/qemu.desktop + + # copy qemu-ga (guest agent) to separate output + mkdir -p $ga/bin + cp $out/bin/qemu-ga $ga/bin/ + '' + optionalString gtkSupport '' + # wrap GTK Binaries + for f in $out/bin/qemu-system-*; do + wrapGApp $f + done + ''; # Add a ‘qemu-kvm’ wrapper for compatibility/convenience. postInstall = '' |