firefoxen: remove unused gstreamer dependencies
Firefox and, by extension, Tor browser don't support gstreamer any more, this removes what are effectively unused dependencies. https://bugzilla.mozilla.org/show_bug.cgi?id=1234092 "Remove gstreamer support"
This commit is contained in:
parent
081f17f0d0
commit
3e7b6b5bfa
@ -19,7 +19,7 @@
|
||||
|
||||
, alsaSupport ? stdenv.isLinux, alsaLib
|
||||
, pulseaudioSupport ? stdenv.isLinux, libpulseaudio
|
||||
, ffmpegSupport ? true, gstreamer, gst-plugins-base
|
||||
, ffmpegSupport ? true
|
||||
, gtk3Support ? true, gtk2, gtk3, wrapGAppsHook
|
||||
, gssSupport ? true, kerberos
|
||||
|
||||
@ -101,7 +101,6 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optional (lib.versionOlder ffversion "61") hunspell
|
||||
++ lib.optional alsaSupport alsaLib
|
||||
++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed
|
||||
++ lib.optionals ffmpegSupport [ gstreamer gst-plugins-base ]
|
||||
++ lib.optional gtk3Support gtk3
|
||||
++ lib.optional gssSupport kerberos
|
||||
++ lib.optionals stdenv.isDarwin [ CoreMedia ExceptionHandling Kerberos
|
||||
@ -221,7 +220,6 @@ stdenv.mkDerivation rec {
|
||||
++ flag pulseaudioSupport "pulseaudio"
|
||||
++ flag ffmpegSupport "ffmpeg"
|
||||
++ flag gssSupport "negotiateauth"
|
||||
++ lib.optional (!ffmpegSupport) "--disable-gstreamer"
|
||||
++ flag webrtcSupport "webrtc"
|
||||
++ flag crashreporterSupport "crashreporter"
|
||||
++ lib.optional drmSupport "--enable-eme=widevine"
|
||||
|
@ -29,13 +29,10 @@
|
||||
|
||||
# Media support (implies audio support)
|
||||
, mediaSupport ? false
|
||||
, gstreamer
|
||||
, gst-plugins-base
|
||||
, gst-plugins-good
|
||||
, gst-ffmpeg
|
||||
, gmp
|
||||
, ffmpeg
|
||||
|
||||
, gmp
|
||||
|
||||
# Pluggable transport dependencies
|
||||
, python27
|
||||
|
||||
@ -85,20 +82,9 @@ let
|
||||
]
|
||||
++ optionals pulseaudioSupport [ libpulseaudio ]
|
||||
++ optionals mediaSupport [
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
gmp
|
||||
ffmpeg
|
||||
];
|
||||
|
||||
gstPluginsPath = concatMapStringsSep ":" (x:
|
||||
"${x}/lib/gstreamer-0.10") [
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
gst-ffmpeg
|
||||
];
|
||||
|
||||
# Library search path for the fte transport
|
||||
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
|
||||
|
||||
@ -366,10 +352,6 @@ stdenv.mkDerivation rec {
|
||||
TOR_CONTROL_PORT="\''${TOR_CONTROL_PORT:-}" \
|
||||
TOR_SOCKS_PORT="\''${TOR_SOCKS_PORT:-}" \
|
||||
\
|
||||
GST_PLUGIN_SYSTEM_PATH="${optionalString mediaSupport gstPluginsPath}" \
|
||||
GST_REGISTRY="/dev/null" \
|
||||
GST_REGISTRY_UPDATE="no" \
|
||||
\
|
||||
FONTCONFIG_FILE="$FONTCONFIG_FILE" \
|
||||
\
|
||||
LD_LIBRARY_PATH="$libPath" \
|
||||
|
@ -19,13 +19,10 @@
|
||||
|
||||
# Media support (implies audio support)
|
||||
, mediaSupport ? false
|
||||
, gstreamer
|
||||
, gst-plugins-base
|
||||
, gst-plugins-good
|
||||
, gst-ffmpeg
|
||||
, gmp
|
||||
, ffmpeg
|
||||
|
||||
, gmp
|
||||
|
||||
# Extensions, common
|
||||
, zip
|
||||
|
||||
@ -72,18 +69,7 @@ let
|
||||
|
||||
fontsDir = "${fontsEnv}/share/fonts";
|
||||
|
||||
gstPluginsPath = concatMapStringsSep ":" (x:
|
||||
"${x}/lib/gstreamer-0.10") [
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
gst-ffmpeg
|
||||
];
|
||||
|
||||
gstLibPath = makeLibraryPath [
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
gmp
|
||||
mediaLibPath = makeLibraryPath [
|
||||
ffmpeg
|
||||
];
|
||||
in
|
||||
@ -207,7 +193,7 @@ stdenv.mkDerivation rec {
|
||||
''}
|
||||
|
||||
${optionalString mediaSupport ''
|
||||
wrapper_LD_LIBRARY_PATH=${gstLibPath}''${wrapper_LD_LIBRARY_PATH:+:$wrapper_LD_LIBRARY_PATH}
|
||||
wrapper_LD_LIBRARY_PATH=${mediaLibPath}''${wrapper_LD_LIBRARY_PATH:+:$wrapper_LD_LIBRARY_PATH}
|
||||
''}
|
||||
|
||||
mkdir -p $out/bin
|
||||
@ -284,10 +270,6 @@ stdenv.mkDerivation rec {
|
||||
#
|
||||
# APULSE_PLAYBACK_DEVICE is for audio playback w/o pulseaudio (no capture yet)
|
||||
#
|
||||
# GST_PLUGIN_SYSTEM_PATH is for HD video playback
|
||||
#
|
||||
# GST_REGISTRY is set to devnull to minimize disk writes
|
||||
#
|
||||
# TOR_* is for using an external tor instance
|
||||
#
|
||||
# Parameters lacking a default value below are *required* (enforced by
|
||||
@ -314,10 +296,6 @@ stdenv.mkDerivation rec {
|
||||
\
|
||||
APULSE_PLAYBACK_DEVICE="\''${APULSE_PLAYBACK_DEVICE:-plug:dmix}" \
|
||||
\
|
||||
GST_PLUGIN_SYSTEM_PATH="${optionalString mediaSupport gstPluginsPath}" \
|
||||
GST_REGISTRY="/dev/null" \
|
||||
GST_REGISTRY_UPDATE="no" \
|
||||
\
|
||||
TOR_SKIP_LAUNCH="\''${TOR_SKIP_LAUNCH:-}" \
|
||||
TOR_CONTROL_PORT="\''${TOR_CONTROL_PORT:-}" \
|
||||
TOR_SOCKS_PORT="\''${TOR_SOCKS_PORT:-}" \
|
||||
|
Loading…
Reference in New Issue
Block a user