Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f1c2f8817b35
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3ba617416cd7
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jul 22, 2020

  1. qemu: drop invalid and redundant qemu.desktop

    @peterhoeg
    peterhoeg committed Jul 22, 2020
    Copy the full SHA
    cde6761 View commit details

Commits on Jul 27, 2020

  1. Merge pull request #93625 from NixOS/f/qemu 

    qemu: drop invalid and redundant qemu.desktop
    @peterhoeg
    peterhoeg authored Jul 27, 2020
    Copy the full SHA
    3ba6174 View commit details
Showing with 12 additions and 9 deletions.
  1. +12 −9 pkgs/applications/virtualization/qemu/default.nix
21 changes: 12 additions & 9 deletions pkgs/applications/virtualization/qemu/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 = ''