diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-09-10 23:24:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-10 23:24:26 -0500 |
| commit | 86d8c55470a0100e98b7c453c1cac16bc560e6f0 (patch) | |
| tree | 5b993e0cc3e13e6f5e6d831f9ab7ef40607a2044 /pkgs/applications/virtualization/qemu/default.nix | |
| parent | 95eabdfd5f6197c83e9e5f53ddb65dbbea3c13fd (diff) | |
| parent | 61517de024cc9e61c18f2434656c18067a2d68a4 (diff) | |
| download | nixpkgs-86d8c55470a0100e98b7c453c1cac16bc560e6f0.tar nixpkgs-86d8c55470a0100e98b7c453c1cac16bc560e6f0.tar.gz nixpkgs-86d8c55470a0100e98b7c453c1cac16bc560e6f0.tar.bz2 nixpkgs-86d8c55470a0100e98b7c453c1cac16bc560e6f0.tar.lz nixpkgs-86d8c55470a0100e98b7c453c1cac16bc560e6f0.tar.xz nixpkgs-86d8c55470a0100e98b7c453c1cac16bc560e6f0.tar.zst nixpkgs-86d8c55470a0100e98b7c453c1cac16bc560e6f0.zip | |
Merge branch 'staging' into ios-13
Diffstat (limited to 'pkgs/applications/virtualization/qemu/default.nix')
| -rw-r--r-- | pkgs/applications/virtualization/qemu/default.nix | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index c5dcc2fafc6..535f8371153 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -18,6 +18,7 @@ , openGLSupport ? sdlSupport, mesa, epoxy, libdrm , virglSupport ? openGLSupport, virglrenderer , smbdSupport ? false, samba +, tpmSupport ? true , hostCpuOnly ? false , hostCpuTargets ? (if hostCpuOnly then (stdenv.lib.optional stdenv.isx86_64 "i386-softmmu" @@ -35,7 +36,7 @@ let in stdenv.mkDerivation rec { - version = "5.0.0"; + version = "5.1.0"; pname = "qemu" + stdenv.lib.optionalString xenSupport "-xen" + stdenv.lib.optionalString hostCpuOnly "-host-cpu-only" @@ -43,7 +44,7 @@ stdenv.mkDerivation rec { src = fetchurl { url= "https://download.qemu.org/qemu-${version}.tar.xz"; - sha256 = "1dlcwyshdp94fwd30pddxf9bn2q8dfw5jsvry2gvdj551wmaj4rg"; + sha256 = "1rd41wwlvp0vpialjp2czs6i3lsc338xc72l3zkbb7ixjfslw5y9"; }; nativeBuildInputs = [ python python.pkgs.sphinx pkgconfig flex bison ] @@ -127,21 +128,25 @@ stdenv.mkDerivation rec { ++ optional cephSupport "--enable-rbd" ++ optional openGLSupport "--enable-opengl" ++ optional virglSupport "--enable-virglrenderer" + ++ optional tpmSupport "--enable-tpm" ++ optional smbdSupport "--smbd=${samba}/bin/smbd"; doCheck = false; # tries to access /dev 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 = '' |