Added ALSA sound support to VirtualBox
svn path=/nixpkgs/trunk/; revision=15785
This commit is contained in:
parent
151031e233
commit
a39c2a0e88
@ -1,6 +1,6 @@
|
|||||||
{ stdenv, fetchurl, iasl, dev86, libxslt, libxml2, libX11, xproto, libXext
|
{ stdenv, fetchurl, iasl, dev86, libxslt, libxml2, libX11, xproto, libXext
|
||||||
, libXcursor, qt3, qt4, libIDL, SDL, hal, libcap, zlib, libpng, glib, kernel
|
, libXcursor, qt3, qt4, libIDL, SDL, hal, libcap, zlib, libpng, glib, kernel
|
||||||
, python, which
|
, python, which, alsaLib
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
@ -11,7 +11,7 @@ stdenv.mkDerivation {
|
|||||||
sha256 = "868ccdfaa9f2d364ba1cf407234d59713a464837e4012104e5a2a5b2ad4c2d5d";
|
sha256 = "868ccdfaa9f2d364ba1cf407234d59713a464837e4012104e5a2a5b2ad4c2d5d";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt3 qt4 libIDL SDL hal libcap glib kernel python];
|
buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt3 qt4 libIDL SDL hal libcap glib kernel python alsaLib];
|
||||||
|
|
||||||
patchPhase = "
|
patchPhase = "
|
||||||
set -x
|
set -x
|
||||||
@ -27,7 +27,7 @@ stdenv.mkDerivation {
|
|||||||
configurePhase = ''
|
configurePhase = ''
|
||||||
# It wants the qt utils from qt3, and it takes them from QTDIR
|
# It wants the qt utils from qt3, and it takes them from QTDIR
|
||||||
export QTDIR=${qt3}
|
export QTDIR=${qt3}
|
||||||
./configure --with-qt-dir=${qt3} --with-qt4-dir=${qt4} --disable-python --disable-alsa --disable-pulse --disable-hardening
|
./configure --with-qt-dir=${qt3} --with-qt4-dir=${qt4} --disable-python --disable-pulse --disable-hardening
|
||||||
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
|
||||||
sed -e 's@arch/x86/@@' \
|
sed -e 's@arch/x86/@@' \
|
||||||
|
@ -5097,7 +5097,7 @@ let
|
|||||||
virtualbox = import ../applications/virtualization/virtualbox {
|
virtualbox = import ../applications/virtualization/virtualbox {
|
||||||
stdenv = stdenv_32bit;
|
stdenv = stdenv_32bit;
|
||||||
inherit fetchurl iasl dev86 libxslt libxml2 qt3 qt4 SDL hal
|
inherit fetchurl iasl dev86 libxslt libxml2 qt3 qt4 SDL hal
|
||||||
libcap libpng zlib kernel python which;
|
libcap libpng zlib kernel python which alsaLib;
|
||||||
inherit (gtkLibs) glib;
|
inherit (gtkLibs) glib;
|
||||||
inherit (xlibs) xproto libX11 libXext libXcursor;
|
inherit (xlibs) xproto libX11 libXext libXcursor;
|
||||||
inherit (gnome) libIDL;
|
inherit (gnome) libIDL;
|
||||||
|
Loading…
Reference in New Issue
Block a user