diff options
author | David Rusu <davidrusu@gmail.com> | 2014-10-25 21:08:11 -0400 |
---|---|---|
committer | David Rusu <davidrusu@gmail.com> | 2014-10-25 21:08:11 -0400 |
commit | d73ae615c503b9d98c565e2a97bd3a9828bd52f9 (patch) | |
tree | 34154ced0bb95a2dd026fb45667349dc8c7053c0 /pkgs/applications/virtualization/virtualbox/default.nix | |
parent | 67f8da419a06f08404d3ebd21f986a7bd1255f8a (diff) | |
parent | 8636d93f541547d83f4aca020dd72ac49207e2b0 (diff) | |
download | nixpkgs-d73ae615c503b9d98c565e2a97bd3a9828bd52f9.tar nixpkgs-d73ae615c503b9d98c565e2a97bd3a9828bd52f9.tar.gz nixpkgs-d73ae615c503b9d98c565e2a97bd3a9828bd52f9.tar.bz2 nixpkgs-d73ae615c503b9d98c565e2a97bd3a9828bd52f9.tar.lz nixpkgs-d73ae615c503b9d98c565e2a97bd3a9828bd52f9.tar.xz nixpkgs-d73ae615c503b9d98c565e2a97bd3a9828bd52f9.tar.zst nixpkgs-d73ae615c503b9d98c565e2a97bd3a9828bd52f9.zip |
Merge https://github.com/NixOS/nixpkgs
Diffstat (limited to 'pkgs/applications/virtualization/virtualbox/default.nix')
-rw-r--r-- | pkgs/applications/virtualization/virtualbox/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 309cfe1f35a..3fa97e78835 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -5,6 +5,7 @@ , javaBindings ? false, jdk ? null , pythonBindings ? false, python ? null , enableExtensionPack ? false, requireFile ? null, patchelf ? null +, pulseSupport ? false, pulseaudio ? null }: with stdenv.lib; @@ -64,7 +65,8 @@ in stdenv.mkDerivation { libcap glib lvm2 python alsaLib curl libvpx pam xorriso makeself perl pkgconfig which libXmu ] ++ optional javaBindings jdk - ++ optional pythonBindings python; + ++ optional pythonBindings python + ++ optional pulseSupport pulseaudio; prePatch = '' set -x @@ -86,7 +88,8 @@ in stdenv.mkDerivation { ./configure --with-qt4-dir=${qt4} \ ${optionalString (!javaBindings) "--disable-java"} \ ${optionalString (!pythonBindings) "--disable-python"} \ - --disable-pulse --disable-hardening --disable-kmods \ + ${optionalString (!pulseSupport) "--disable-pulse"} \ + --disable-hardening --disable-kmods \ --with-mkisofs=${xorriso}/bin/xorrisofs sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \ -i AutoConfig.kmk |