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

Commits on Apr 27, 2020

  1. nixos/qemu-vm: don't set -vga std 

    This has been default since QEMU 2.2, it also prevents using a different
-vga
    @worldofpeace @teto
    worldofpeace authored and teto committed Apr 27, 2020
    Copy the full SHA
    a7ca287 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 nixos/modules/virtualisation/qemu-vm.nix
2 changes: 1 addition & 1 deletion nixos/modules/virtualisation/qemu-vm.nix
View file
Original file line number Diff line number Diff line change
@@ -499,7 +499,7 @@ in
# FIXME: Consolidate this one day.
virtualisation.qemu.options = mkMerge [
(mkIf (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [
"-vga std" "-usb" "-device usb-tablet,bus=usb-bus.0"
"-usb" "-device usb-tablet,bus=usb-bus.0"
])
(mkIf (pkgs.stdenv.isAarch32 || pkgs.stdenv.isAarch64) [
"-device virtio-gpu-pci" "-device usb-ehci,id=usb0" "-device usb-kbd" "-device usb-tablet"