mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 12:59:04 +02:00
qemu: fix documentation
This commit is contained in:
parent
d215c18479
commit
ef8addb919
|
@ -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
|
, ncurses, perl, pixman, vde2, alsaLib, texinfo, flex
|
||||||
, bison, lzo, snappy, libaio, gnutls, nettle, curl
|
, bison, lzo, snappy, libaio, gnutls, nettle, curl
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
|
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "085g6f75si8hbn94mnnjn1r7ysixn5bqj4bhqwvadj00fhzp2zvd";
|
sha256 = "085g6f75si8hbn94mnnjn1r7ysixn5bqj4bhqwvadj00fhzp2zvd";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ python2 pkgconfig flex bison ];
|
nativeBuildInputs = [ python python.pkgs.sphinx pkgconfig flex bison ];
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ zlib glib ncurses perl pixman
|
[ zlib glib ncurses perl pixman
|
||||||
vde2 texinfo makeWrapper lzo snappy
|
vde2 texinfo makeWrapper lzo snappy
|
||||||
|
@ -112,6 +112,7 @@ stdenv.mkDerivation rec {
|
||||||
[ "--audio-drv-list=${audio}"
|
[ "--audio-drv-list=${audio}"
|
||||||
"--sysconfdir=/etc"
|
"--sysconfdir=/etc"
|
||||||
"--localstatedir=/var"
|
"--localstatedir=/var"
|
||||||
|
"--enable-docs"
|
||||||
]
|
]
|
||||||
# disable sysctl check on darwin.
|
# disable sysctl check on darwin.
|
||||||
++ optional stdenv.isDarwin "--cpu=x86_64"
|
++ optional stdenv.isDarwin "--cpu=x86_64"
|
||||||
|
|
|
@ -19803,6 +19803,7 @@ in
|
||||||
qemu = callPackage ../applications/virtualization/qemu {
|
qemu = callPackage ../applications/virtualization/qemu {
|
||||||
inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Hypervisor;
|
inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Hypervisor;
|
||||||
inherit (darwin.stubs) rez setfile;
|
inherit (darwin.stubs) rez setfile;
|
||||||
|
python = python3;
|
||||||
};
|
};
|
||||||
|
|
||||||
qgis-unwrapped = libsForQt5.callPackage ../applications/gis/qgis/unwrapped.nix {
|
qgis-unwrapped = libsForQt5.callPackage ../applications/gis/qgis/unwrapped.nix {
|
||||||
|
|
Loading…
Reference in a new issue