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: 7f355dcc4ee4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b7871c3f2da1
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 25, 2021

  1. qemu: fix build when desktop file does not exist (#110721) 

    The qemu-user variants as used by binfmt emulation through
`(lib.systems.elaborate lib.systems.examples.aarch64-multiplatform).emulator pkgs`
does not install a .desktop file since qemu 5.2.0. This change allows
the build to continue if deletion of the desktop file fails.
    Milan authored Jan 25, 2021
    Copy the full SHA
    b7871c3 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/applications/virtualization/qemu/default.nix
2 changes: 1 addition & 1 deletion pkgs/applications/virtualization/qemu/default.nix
View file
Original file line number Diff line number Diff line change
@@ -143,7 +143,7 @@ stdenv.mkDerivation rec {

postFixup = ''
# the .desktop is both invalid and pointless
rm $out/share/applications/qemu.desktop
rm -f $out/share/applications/qemu.desktop
# copy qemu-ga (guest agent) to separate output
mkdir -p $ga/bin