colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #227477 from amjoseph-nixpkgs/pr/qemu/enableDocs

Browse Source
This commit is contained in:
Artturi 2023-04-22 10:07:15 +03:00 committed by GitHub
commit b0a5a68955
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/systems/default.nix
View File

@ -185,6 +185,7 @@ rec {
pulseSupport = false;
smbdSupport = false;
seccompSupport = false;
enableDocs = false;
hostCpuTargets = [ "${final.qemuArch}-linux-user" ];
};
wine = (pkgs.winePackagesFor "wine${toString final.parsed.cpu.bits}").minimal;

3
pkgs/applications/virtualization/qemu/default.nix
View File

@ -27,6 +27,7 @@
, tpmSupport ? true
, uringSupport ? stdenv.isLinux, liburing
, canokeySupport ? false, canokey-qemu
, enableDocs ? true
, hostCpuOnly ? false
, hostCpuTargets ? (if hostCpuOnly
then (lib.optional stdenv.isx86_64 "i386-softmmu"
@ -147,7 +148,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--disable-strip" # We'll strip ourselves after separating debug info.
"--enable-docs"
(lib.enableFeature enableDocs "docs")
"--enable-tools"
"--localstatedir=/var"
"--sysconfdir=/etc"