diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index 3e73da3f454..c7bed6aa247 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -16,20 +16,10 @@ hostmakedepends="which unzip zip pkg-config perl python yasm" makedepends="nss-devel>=3.16 libjpeg-turbo-devel libpng-devel>=1.6 pixman-devel sqlite-devel gst-plugins-base-devel gtk+-devel libevent-devel libnotify-devel libvpx-devel>1.3.0 libXrender-devel - startup-notification-devel dbus-glib-devel alsa-lib-devel + startup-notification-devel dbus-glib-devel alsa-lib-devel pulseaudio-devel hunspell-devel>=1.3.2 libSM-devel libXScrnSaver-devel libXt-devel" depends="nss>=3.16 desktop-file-utils hicolor-icon-theme" -# Package build options -build_options="pulseaudio" -build_options_default="pulseaudio" -desc_option_pulseaudio="Enable support for the PulseAudio sound server" - -if [ "$build_option_pulseaudio" ]; then - makedepends+=" pulseaudio-devel alsa-plugins-pulseaudio" - depends+=" alsa-plugins-pulseaudio" -fi - pre_configure() { # Google API key (see http://www.chromium.org/developers/how-tos/api-keys) # Note: This is for Void Linux use ONLY. @@ -53,12 +43,6 @@ do_configure() { export ac_cv_prog_hostcxx_works=1 fi - if [ "$build_option_pulseaudio" ]; then - args="--enable-pulseaudio" - else - args="--disable-pulseaudio" - fi - cd xbps-build SHELL=/bin/bash ../configure --prefix=/usr --libdir=/usr/lib \ --with-system-nspr --with-system-nss --with-system-bz2 \ @@ -70,8 +54,9 @@ do_configure() { --enable-skia --disable-debug --disable-gnomevfs --disable-gconf \ --disable-crashreporter --disable-updater --disable-tests \ --disable-mochitest --disable-installer --disable-elf-hack \ + --enable-pulseaudio \ --with-nspr-prefix=${XBPS_CROSS_BASE}/usr \ - --with-nss-prefix=${XBPS_CROSS_BASE}/usr ${args} ${cross_args} \ + --with-nss-prefix=${XBPS_CROSS_BASE}/usr ${cross_args} \ --with-google-api-keyfile="${wrksrc}/google-api-key" }