b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

qemu: fix documentation

Browse source
This commit is contained in:
Nikolay Amiantov 2019-07-03 19:33:16 +03:00
parent d215c18479
commit ef8addb919
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/applications/virtualization/qemu/default.nix
View file

@ -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"

1
pkgs/top-level/all-packages.nix
View file

@ -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 {