diff options
| author | Ruben Maher <ruben@maher.fyi> | 2018-06-10 22:18:31 +0000 |
|---|---|---|
| committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-06-11 00:18:31 +0200 |
| commit | 0b3f13d442642b9ea154b7cba88131a60bc1e54d (patch) | |
| tree | d6bea34bb5c383fae3ffb935427eb1c6db099ed8 /pkgs/applications | |
| parent | 8d488247e11a0820c667ecdaa72a04a7a4585f42 (diff) | |
| download | nixlib-0b3f13d442642b9ea154b7cba88131a60bc1e54d.tar nixlib-0b3f13d442642b9ea154b7cba88131a60bc1e54d.tar.gz nixlib-0b3f13d442642b9ea154b7cba88131a60bc1e54d.tar.bz2 nixlib-0b3f13d442642b9ea154b7cba88131a60bc1e54d.tar.lz nixlib-0b3f13d442642b9ea154b7cba88131a60bc1e54d.tar.xz nixlib-0b3f13d442642b9ea154b7cba88131a60bc1e54d.tar.zst nixlib-0b3f13d442642b9ea154b7cba88131a60bc1e54d.zip | |
pkgs/qemu: tell qemu where to find smbd if smbdSupport is true (#41615)
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/virtualization/qemu/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 8c429ff1d062..05d8c1edec29 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -15,6 +15,7 @@ , xenSupport ? false, xen , openGLSupport ? sdlSupport, mesa_noglu, epoxy, libdrm , virglSupport ? openGLSupport, virglrenderer +, smbdSupport ? false, samba , hostCpuOnly ? false , nixosTestRunner ? false }: @@ -63,7 +64,8 @@ stdenv.mkDerivation rec { ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ] ++ optionals xenSupport [ xen ] ++ optionals openGLSupport [ mesa_noglu epoxy libdrm ] - ++ optionals virglSupport [ virglrenderer ]; + ++ optionals virglSupport [ virglrenderer ] + ++ optionals smbdSupport [ samba ]; enableParallelBuilding = true; @@ -100,8 +102,7 @@ stdenv.mkDerivation rec { ''; configureFlags = - [ "--smbd=smbd" # use `smbd' from $PATH - "--audio-drv-list=${audio}" + [ "--audio-drv-list=${audio}" "--sysconfdir=/etc" "--localstatedir=/var" ] @@ -117,7 +118,8 @@ stdenv.mkDerivation rec { ++ optional gtkSupport "--enable-gtk" ++ optional xenSupport "--enable-xen" ++ optional openGLSupport "--enable-opengl" - ++ optional virglSupport "--enable-virglrenderer"; + ++ optional virglSupport "--enable-virglrenderer" + ++ optional smbdSupport "--smbd=${samba}/bin/smbd"; doCheck = false; # tries to access /dev |