diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-05-04 03:19:25 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-05-04 20:54:49 +0200 |
| commit | 3837dddedb64ae9456e0b07ae2915c828e92eb7f (patch) | |
| tree | 3a4e0d510e3eb37c7520f7c16e7e8da0826e1f31 /pkgs | |
| parent | b45ef79b74d267891a11c1775a473c610ecebe78 (diff) | |
| download | nixpkgs-3837dddedb64ae9456e0b07ae2915c828e92eb7f.tar nixpkgs-3837dddedb64ae9456e0b07ae2915c828e92eb7f.tar.gz nixpkgs-3837dddedb64ae9456e0b07ae2915c828e92eb7f.tar.bz2 nixpkgs-3837dddedb64ae9456e0b07ae2915c828e92eb7f.tar.lz nixpkgs-3837dddedb64ae9456e0b07ae2915c828e92eb7f.tar.xz nixpkgs-3837dddedb64ae9456e0b07ae2915c828e92eb7f.tar.zst nixpkgs-3837dddedb64ae9456e0b07ae2915c828e92eb7f.zip | |
firefox: remove GStreamer
Apparently, it has been dropped: https://bugzilla.mozilla.org/show_bug.cgi?id=1234092
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/wrapper.nix | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index ed6cf712ed9..b619941820e 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,7 +2,7 @@ ## various stuff that can be plugged in , flashplayer, hal-flash -, MPlayerPlugin, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra-gtk2 +, MPlayerPlugin, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2 , jrePlugin, icedtea_web , trezor-bridge, bluejeans, djview4, adobe-reader , google_talk_plugin, fribid, gnome3/*.gnome-shell*/ @@ -67,13 +67,12 @@ let ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator ++ extraNativeMessagingHosts ); - libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ]) + libs = lib.optional ffmpegSupport ffmpeg ++ lib.optional gssSupport kerberos ++ lib.optionals (cfg.enableQuakeLive or false) (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib libudev ]) ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash ++ lib.optional (config.pulseaudio or true) libpulseaudio; - gst-plugins = with gst_all; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ]; gtk_modules = [ libcanberra-gtk2 ]; in stdenv.mkDerivation { @@ -99,7 +98,6 @@ let }; buildInputs = [makeWrapper] - ++ lib.optional (!ffmpegSupport) gst-plugins ++ lib.optional (browser ? gtk3) browser.gtk3; buildCommand = '' @@ -119,9 +117,7 @@ let --suffix PATH ':' "$out/bin" \ --set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \ --set MOZ_SYSTEM_DIR "$out/lib/mozilla" \ - ${lib.optionalString (!ffmpegSupport) - ''--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"'' - + lib.optionalString (browser ? gtk3) + ${lib.optionalString (browser ? gtk3) ''--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --suffix XDG_DATA_DIRS : '${gnome3.defaultIconTheme}/share' '' |