From 0b3f13d442642b9ea154b7cba88131a60bc1e54d Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Sun, 10 Jun 2018 22:18:31 +0000 Subject: [PATCH] pkgs/qemu: tell qemu where to find smbd if smbdSupport is true (#41615) --- pkgs/applications/virtualization/qemu/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 8c429ff1d06..05d8c1edec2 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