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

firefox: upstream moved to ffmpeg from gstreamer

Browse Source 
Sadly, they don't support using system library yet (or I was unattentive).
This commit is contained in:
Nikolay Amiantov 2016-05-15 01:05:46 +03:00
parent 41aa123345
commit e81c6c7768
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/networking/browsers/firefox/default.nix
View File

@ -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, libpulseaudio , cairo, 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
@ -36,7 +36,7 @@ common = { pname, version, sha512 }: stdenv.mkDerivation rec {
xorg.libXScrnSaver xorg.scrnsaverproto pysqlite xorg.libXScrnSaver xorg.scrnsaverproto pysqlite
xorg.libXext xorg.xextproto sqlite unzip makeWrapper xorg.libXext xorg.xextproto sqlite unzip makeWrapper
hunspell libevent libstartup_notification /* libvpx */ /* cairo */ hunspell libevent libstartup_notification /* libvpx */ /* cairo */
gstreamer gst_plugins_base icu libpng jemalloc icu libpng jemalloc
libpulseaudio # only headers are needed libpulseaudio # only headers are needed
] ]
++ lib.optional enableGTK3 gtk3; ++ lib.optional enableGTK3 gtk3;
@ -58,7 +58,6 @@ common = { pname, version, sha512 }: stdenv.mkDerivation rec {
"--enable-system-pixman" "--enable-system-pixman"
"--enable-system-sqlite" "--enable-system-sqlite"
#"--enable-system-cairo" #"--enable-system-cairo"
"--enable-gstreamer"
"--enable-startup-notification" "--enable-startup-notification"
"--enable-content-sandbox" # available since 26.0, but not much info available "--enable-content-sandbox" # available since 26.0, but not much info available
"--disable-content-sandbox-reporter" # keeping disabled for now "--disable-content-sandbox-reporter" # keeping disabled for now

8
pkgs/applications/networking/browsers/firefox/wrapper.nix
View File

@ -2,7 +2,7 @@
## various stuff that can be plugged in ## various stuff that can be plugged in
, gnash, flashplayer, hal-flash , gnash, flashplayer, hal-flash
, MPlayerPlugin, gecko_mediaplayer, gst_all, xorg, libpulseaudio, libcanberra , MPlayerPlugin, gecko_mediaplayer, ffmpeg, xorg, libpulseaudio, libcanberra
, supportsJDK, jrePlugin, icedtea_web , supportsJDK, jrePlugin, icedtea_web
, trezor-bridge, bluejeans, djview4, adobe-reader , trezor-bridge, bluejeans, djview4, adobe-reader
, google_talk_plugin, fribid, gnome3/*.gnome_shell*/ , google_talk_plugin, fribid, gnome3/*.gnome_shell*/
@ -45,12 +45,11 @@ let
++ lib.optional (cfg.enableAdobeReader or false) adobe-reader ++ lib.optional (cfg.enableAdobeReader or false) adobe-reader
++ lib.optional (cfg.enableEsteid or false) esteidfirefoxplugin ++ lib.optional (cfg.enableEsteid or false) esteidfirefoxplugin
); );
libs = [ gst_all.gstreamer gst_all.gst-plugins-base ] libs = [ ffmpeg ]
++ lib.optionals (cfg.enableQuakeLive or false) ++ lib.optionals (cfg.enableQuakeLive or false)
(with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) (with xorg; [ 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; ++ lib.optional (config.pulseaudio or false) libpulseaudio;
gst-plugins = with gst_all; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ];
gtk_modules = [ libcanberra ]; gtk_modules = [ libcanberra ];
in in
@ -76,7 +75,7 @@ stdenv.mkDerivation {
]; ];
}; };
buildInputs = [makeWrapper] ++ gst-plugins; buildInputs = [makeWrapper];
buildCommand = '' buildCommand = ''
if [ ! -x "${browser}/bin/${browserName}" ] if [ ! -x "${browser}/bin/${browserName}" ]
@ -91,7 +90,6 @@ stdenv.mkDerivation {
--suffix LD_LIBRARY_PATH ':' "$libs" \ --suffix LD_LIBRARY_PATH ':' "$libs" \
--suffix-each GTK_PATH ':' "$gtk_modules" \ --suffix-each GTK_PATH ':' "$gtk_modules" \
--suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \ --suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \
--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \
--prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \ --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \
--set MOZ_OBJDIR "$(ls -d "${browser}/lib/${browserName}"*)" --set MOZ_OBJDIR "$(ls -d "${browser}/lib/${browserName}"*)"