diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/virtualization/qemu/default.nix')
-rw-r--r-- | nixpkgs/pkgs/applications/virtualization/qemu/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/applications/virtualization/qemu/default.nix b/nixpkgs/pkgs/applications/virtualization/qemu/default.nix index 459d1a396b3a..d64baca2cc7e 100644 --- a/nixpkgs/pkgs/applications/virtualization/qemu/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/qemu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, python2, zlib, pkgconfig, glib +{ stdenv, fetchurl, fetchpatch, python, zlib, pkgconfig, glib , ncurses, perl, pixman, vde2, alsaLib, texinfo, flex , bison, lzo, snappy, libaio, gnutls, nettle, curl , makeWrapper @@ -15,7 +15,7 @@ , usbredirSupport ? spiceSupport, usbredir , xenSupport ? false, xen , cephSupport ? false, ceph -, openGLSupport ? sdlSupport, mesa_noglu, epoxy, libdrm +, openGLSupport ? sdlSupport, mesa, epoxy, libdrm , virglSupport ? openGLSupport, virglrenderer , smbdSupport ? false, samba , hostCpuOnly ? false @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { sha256 = "085g6f75si8hbn94mnnjn1r7ysixn5bqj4bhqwvadj00fhzp2zvd"; }; - nativeBuildInputs = [ python2 pkgconfig flex bison ]; + nativeBuildInputs = [ python python.pkgs.sphinx pkgconfig flex bison ]; buildInputs = [ zlib glib ncurses perl pixman vde2 texinfo makeWrapper lzo snappy @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ] ++ optionals xenSupport [ xen ] ++ optionals cephSupport [ ceph ] - ++ optionals openGLSupport [ mesa_noglu epoxy libdrm ] + ++ optionals openGLSupport [ mesa epoxy libdrm ] ++ optionals virglSupport [ virglrenderer ] ++ optionals smbdSupport [ samba ]; @@ -112,6 +112,7 @@ stdenv.mkDerivation rec { [ "--audio-drv-list=${audio}" "--sysconfdir=/etc" "--localstatedir=/var" + "--enable-docs" ] # disable sysctl check on darwin. ++ optional stdenv.isDarwin "--cpu=x86_64" |