summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorPeter Hoeg <peter@hoeg.com>2020-08-24 08:31:16 +0800
committerGitHub <noreply@github.com>2020-08-24 08:31:16 +0800
commit27834e394d67f9b3f1c9fccfb3bcc0e40e5ab536 (patch)
tree58132bd20440116250a6ec3c858159adb7e3ebf8 /pkgs/applications
parente4dbe2aab608f3d02298536701d0ec52ad26f275 (diff)
parent4e73ee6a53aa13eb0e922971f7c34f7dc5de4590 (diff)
downloadnixpkgs-27834e394d67f9b3f1c9fccfb3bcc0e40e5ab536.tar
nixpkgs-27834e394d67f9b3f1c9fccfb3bcc0e40e5ab536.tar.gz
nixpkgs-27834e394d67f9b3f1c9fccfb3bcc0e40e5ab536.tar.bz2
nixpkgs-27834e394d67f9b3f1c9fccfb3bcc0e40e5ab536.tar.lz
nixpkgs-27834e394d67f9b3f1c9fccfb3bcc0e40e5ab536.tar.xz
nixpkgs-27834e394d67f9b3f1c9fccfb3bcc0e40e5ab536.tar.zst
nixpkgs-27834e394d67f9b3f1c9fccfb3bcc0e40e5ab536.zip
Merge pull request #96019 from baloo/baloo/qemu/tpm-support
qemu: adds tpm support
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/virtualization/qemu/default.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 7cbc3e4c619..535f8371153 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -18,6 +18,7 @@
 , openGLSupport ? sdlSupport, mesa, epoxy, libdrm
 , virglSupport ? openGLSupport, virglrenderer
 , smbdSupport ? false, samba
+, tpmSupport ? true
 , hostCpuOnly ? false
 , hostCpuTargets ? (if hostCpuOnly
                     then (stdenv.lib.optional stdenv.isx86_64 "i386-softmmu"
@@ -127,6 +128,7 @@ stdenv.mkDerivation rec {
     ++ optional cephSupport "--enable-rbd"
     ++ optional openGLSupport "--enable-opengl"
     ++ optional virglSupport "--enable-virglrenderer"
+    ++ optional tpmSupport "--enable-tpm"
     ++ optional smbdSupport "--smbd=${samba}/bin/smbd";
 
   doCheck = false; # tries to access /dev