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

add pulseaudio to virtualbox

This commit is contained in:
Corey O'Connor 2014-04-17 15:36:41 -07:00 committed by Aristid Breitkreuz
parent f426de737c
commit 48dc0eacb8
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/virtualization/virtualbox/default.nix
View File

@ -5,6 +5,7 @@
, javaBindings ? false, jdk ? null , javaBindings ? false, jdk ? null
, pythonBindings ? false, python ? null , pythonBindings ? false, python ? null
, enableExtensionPack ? false, requireFile ? null, patchelf ? null , enableExtensionPack ? false, requireFile ? null, patchelf ? null
, pulseSupport ? false, pulseaudio ? null
}: }:
with stdenv.lib; with stdenv.lib;
@ -64,7 +65,8 @@ in stdenv.mkDerivation {
libcap glib lvm2 python alsaLib curl libvpx pam xorriso makeself perl libcap glib lvm2 python alsaLib curl libvpx pam xorriso makeself perl
pkgconfig which libXmu ] pkgconfig which libXmu ]
++ optional javaBindings jdk ++ optional javaBindings jdk
++ optional pythonBindings python; ++ optional pythonBindings python
++ optional pulseSupport pulseaudio;
prePatch = '' prePatch = ''
set -x set -x
@ -86,7 +88,8 @@ in stdenv.mkDerivation {
./configure --with-qt4-dir=${qt4} \ ./configure --with-qt4-dir=${qt4} \
${optionalString (!javaBindings) "--disable-java"} \ ${optionalString (!javaBindings) "--disable-java"} \
${optionalString (!pythonBindings) "--disable-python"} \ ${optionalString (!pythonBindings) "--disable-python"} \
--disable-pulse --disable-hardening --disable-kmods \ ${optionalString (!pulseSupport) "--disable-pulse"} \
--disable-hardening --disable-kmods \
--with-mkisofs=${xorriso}/bin/xorrisofs --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@' \ sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \
-i AutoConfig.kmk -i AutoConfig.kmk

1
pkgs/top-level/all-packages.nix
View File

@ -8043,6 +8043,7 @@ let
stdenv = stdenv_32bit; stdenv = stdenv_32bit;
inherit (gnome) libIDL; inherit (gnome) libIDL;
enableExtensionPack = config.virtualbox.enableExtensionPack or false; enableExtensionPack = config.virtualbox.enableExtensionPack or false;
pulseSupport = config.pulseaudio or false;
}; };
virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { }; virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { };