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

pkgs/qemu: tell qemu where to find smbd if smbdSupport is true (#41615)

Browse Source
This commit is contained in:
Ruben Maher 2018-06-10 22:18:31 +00:00 committed by xeji
parent 8d488247e1
commit 0b3f13d442
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,7 @@
, xenSupport ? false, xen , xenSupport ? false, xen
, openGLSupport ? sdlSupport, mesa_noglu, epoxy, libdrm , openGLSupport ? sdlSupport, mesa_noglu, epoxy, libdrm
, virglSupport ? openGLSupport, virglrenderer , virglSupport ? openGLSupport, virglrenderer
, smbdSupport ? false, samba
, hostCpuOnly ? false , hostCpuOnly ? false
, nixosTestRunner ? false , nixosTestRunner ? false
}: }:
@ -63,7 +64,8 @@ stdenv.mkDerivation rec {
++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ] ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ]
++ optionals xenSupport [ xen ] ++ optionals xenSupport [ xen ]
++ optionals openGLSupport [ mesa_noglu epoxy libdrm ] ++ optionals openGLSupport [ mesa_noglu epoxy libdrm ]
++ optionals virglSupport [ virglrenderer ]; ++ optionals virglSupport [ virglrenderer ]
++ optionals smbdSupport [ samba ];
enableParallelBuilding = true; enableParallelBuilding = true;
@ -100,8 +102,7 @@ stdenv.mkDerivation rec {
''; '';
configureFlags = configureFlags =
[ "--smbd=smbd" # use `smbd' from $PATH [ "--audio-drv-list=${audio}"
"--audio-drv-list=${audio}"
"--sysconfdir=/etc" "--sysconfdir=/etc"
"--localstatedir=/var" "--localstatedir=/var"
] ]
@ -117,7 +118,8 @@ stdenv.mkDerivation rec {
++ optional gtkSupport "--enable-gtk" ++ optional gtkSupport "--enable-gtk"
++ optional xenSupport "--enable-xen" ++ optional xenSupport "--enable-xen"
++ optional openGLSupport "--enable-opengl" ++ optional openGLSupport "--enable-opengl"
++ optional virglSupport "--enable-virglrenderer"; ++ optional virglSupport "--enable-virglrenderer"
++ optional smbdSupport "--smbd=${samba}/bin/smbd";
doCheck = false; # tries to access /dev doCheck = false; # tries to access /dev