diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2016-09-05 18:37:03 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2017-03-05 13:59:28 +0000 |
| commit | eff9b09fb737bf7e619cd3fed65566857ed663e0 (patch) | |
| tree | 1dd6fc26d4b3852c9a27ae602a05889a1066d71d /pkgs/applications/virtualization/qemu | |
| parent | 4da420709d1408addd0cfd1406c18e7ec3d1d941 (diff) | |
| download | nixlib-eff9b09fb737bf7e619cd3fed65566857ed663e0.tar nixlib-eff9b09fb737bf7e619cd3fed65566857ed663e0.tar.gz nixlib-eff9b09fb737bf7e619cd3fed65566857ed663e0.tar.bz2 nixlib-eff9b09fb737bf7e619cd3fed65566857ed663e0.tar.lz nixlib-eff9b09fb737bf7e619cd3fed65566857ed663e0.tar.xz nixlib-eff9b09fb737bf7e619cd3fed65566857ed663e0.tar.zst nixlib-eff9b09fb737bf7e619cd3fed65566857ed663e0.zip | |
qemu: separate usbredirSupport option out of spiceSupport option
Diffstat (limited to 'pkgs/applications/virtualization/qemu')
| -rw-r--r-- | pkgs/applications/virtualization/qemu/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index b201e2299310..a8f11de96bcf 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -9,7 +9,8 @@ , pulseSupport ? !stdenv.isDarwin, libpulseaudio , sdlSupport ? !stdenv.isDarwin, SDL , vncSupport ? true, libjpeg, libpng -, spiceSupport ? !stdenv.isDarwin, spice, spice_protocol, usbredir +, spiceSupport ? !stdenv.isDarwin, spice, spice_protocol +, usbredirSupport ? spiceSupport, usbredir , x86Only ? false , nixosTestRunner ? false }: @@ -44,7 +45,8 @@ stdenv.mkDerivation rec { ++ optionals pulseSupport [ libpulseaudio ] ++ optionals sdlSupport [ SDL ] ++ optionals vncSupport [ libjpeg libpng ] - ++ optionals spiceSupport [ spice_protocol spice usbredir ] + ++ optionals spiceSupport [ spice_protocol spice ] + ++ optionals usbredirSupport [ usbredir ] ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ]; enableParallelBuilding = true; @@ -95,6 +97,7 @@ stdenv.mkDerivation rec { ++ optional numaSupport "--enable-numa" ++ optional seccompSupport "--enable-seccomp" ++ optional spiceSupport "--enable-spice" + ++ optional usbredirSupport "--enable-usb-redir" ++ optional x86Only "--target-list=i386-softmmu,x86_64-softmmu" ++ optional stdenv.isDarwin "--enable-cocoa" ++ optional stdenv.isLinux "--enable-linux-aio"; |