firefox: build with pulseaudio support (close #8087)
This commit is contained in:
parent
e53e1c7070
commit
8f59f4c78c
|
@ -3,7 +3,7 @@
|
||||||
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
|
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
|
||||||
, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
|
, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
|
||||||
, hunspell, libevent, libstartup_notification, libvpx
|
, hunspell, libevent, libstartup_notification, libvpx
|
||||||
, cairo, gstreamer, gst_plugins_base, icu, libpng, jemalloc
|
, cairo, gstreamer, gst_plugins_base, icu, libpng, jemalloc, libpulseaudio
|
||||||
, enableGTK3 ? false
|
, enableGTK3 ? false
|
||||||
, debugBuild ? false
|
, debugBuild ? false
|
||||||
, # If you want the resulting program to call itself "Firefox" instead
|
, # If you want the resulting program to call itself "Firefox" instead
|
||||||
|
@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
|
||||||
xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
|
xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
|
||||||
xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
|
xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
|
||||||
hunspell libevent libstartup_notification libvpx cairo
|
hunspell libevent libstartup_notification libvpx cairo
|
||||||
gstreamer gst_plugins_base icu libpng
|
gstreamer gst_plugins_base icu libpng jemalloc
|
||||||
jemalloc
|
libpulseaudio # only headers are needed
|
||||||
]
|
]
|
||||||
++ lib.optional enableGTK3 gtk3;
|
++ lib.optional enableGTK3 gtk3;
|
||||||
|
|
||||||
|
@ -65,7 +65,6 @@ stdenv.mkDerivation rec {
|
||||||
"--disable-necko-wifi" # maybe we want to enable this at some point
|
"--disable-necko-wifi" # maybe we want to enable this at some point
|
||||||
"--disable-installer"
|
"--disable-installer"
|
||||||
"--disable-updater"
|
"--disable-updater"
|
||||||
"--disable-pulseaudio"
|
|
||||||
"--enable-jemalloc"
|
"--enable-jemalloc"
|
||||||
]
|
]
|
||||||
++ lib.optional enableGTK3 "--enable-default-toolkit=cairo-gtk3"
|
++ lib.optional enableGTK3 "--enable-default-toolkit=cairo-gtk3"
|
||||||
|
|
|
@ -13282,7 +13282,8 @@ let
|
||||||
);
|
);
|
||||||
libs = [ gstreamer gst_plugins_base ] ++ lib.optionals (cfg.enableQuakeLive or false)
|
libs = [ gstreamer gst_plugins_base ] ++ lib.optionals (cfg.enableQuakeLive or false)
|
||||||
(with xlibs; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ])
|
(with xlibs; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ])
|
||||||
++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash;
|
++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash
|
||||||
|
++ lib.optional (config.pulseaudio or false) libpulseaudio;
|
||||||
gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_bad gst_plugins_ugly gst_ffmpeg ];
|
gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_bad gst_plugins_ugly gst_ffmpeg ];
|
||||||
gtk_modules = [ libcanberra ];
|
gtk_modules = [ libcanberra ];
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue