From ef8addb9196aae1e7c6533dad08460318e125ba0 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 3 Jul 2019 19:33:16 +0300 Subject: [PATCH] qemu: fix documentation --- pkgs/applications/virtualization/qemu/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 1e39f049646..d64baca2cc7 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/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 @@ -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 @@ -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" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 87efce6a995..3a1835850ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19803,6 +19803,7 @@ in qemu = callPackage ../applications/virtualization/qemu { inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Hypervisor; inherit (darwin.stubs) rez setfile; + python = python3; }; qgis-unwrapped = libsForQt5.callPackage ../applications/gis/qgis/unwrapped.nix {