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

Revert "firefox-wrapper: remove gnash support, see #22342"

Browse Source 
Accidentally committed other changes

This reverts commit f77bc59af6.
This commit is contained in:
Graham Christensen 2017-02-06 21:39:09 -05:00
parent f77bc59af6
commit 267813f4f7
No known key found for this signature in database
GPG Key ID: 06121D366FE9435C
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
{ stdenv, lib, makeDesktopItem, makeWrapper, config { stdenv, lib, makeDesktopItem, makeWrapper, config
## various stuff that can be plugged in ## various stuff that can be plugged in
, flashplayer, hal-flash , gnash, flashplayer, hal-flash
, MPlayerPlugin, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra_gtk2 , MPlayerPlugin, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra_gtk2
, supportsJDK, jrePlugin, icedtea_web , supportsJDK, jrePlugin, icedtea_web
, trezor-bridge, bluejeans, djview4, adobe-reader , trezor-bridge, bluejeans, djview4, adobe-reader
@ -23,13 +23,16 @@ browser:
let let
cfg = stdenv.lib.attrByPath [ browserName ] {} config; cfg = stdenv.lib.attrByPath [ browserName ] {} config;
enableAdobeFlash = cfg.enableAdobeFlash or false; enableAdobeFlash = cfg.enableAdobeFlash or false;
enableGnash = cfg.enableGnash or false;
ffmpegSupport = browser.ffmpegSupport or false; ffmpegSupport = browser.ffmpegSupport or false;
jre = cfg.jre or false; jre = cfg.jre or false;
icedtea = cfg.icedtea or false; icedtea = cfg.icedtea or false;
plugins = plugins =
assert !(enableGnash && enableAdobeFlash);
assert !(jre && icedtea); assert !(jre && icedtea);
([ ] ([ ]
++ lib.optional enableGnash gnash
++ lib.optional enableAdobeFlash flashplayer ++ lib.optional enableAdobeFlash flashplayer
++ lib.optional (cfg.enableDjvu or false) (djview4) ++ lib.optional (cfg.enableDjvu or false) (djview4)
++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser) ++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser)

18
pkgs/development/libraries/jbig2dec/default.nix
View File

@ -1,23 +1,15 @@
{ stdenv, fetchurl, fetchpatch }: { stdenv, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "jbig2dec-0.13"; name = "jbig2dec-0.11";
src = fetchurl { src = fetchurl {
url = "http://downloads.ghostscript.com/public/jbig2dec/${name}.tar.gz"; url = "mirror://sourceforge/jbig2dec/${name}.tar.xz";
sha256 = "04akiwab8iy5iy34razcvh9mcja9wy737civ3sbjxk4j143s1b2s"; sha256 = "1xddc30garsg5j8p348cz5l8vn8j7723c0sykv0kc1w5ihaghsq1";
}; };
patches =
[ (fetchpatch {
url = "http://git.ghostscript.com/?p=jbig2dec.git;a=patch;h=e698d5c11d27212aa1098bc5b1673a3378563092";
sha256 = "1fc8xm1z98xj2zkcl0zj7dpjjsbz3vn61b59jnkhcyzy3iiczv7f";
name = "CVE-2016-9601.patch";
})
];
meta = { meta = {
homepage = https://www.ghostscript.com/jbig2dec.html; homepage = http://jbig2dec.sourceforge.net/;
description = "Decoder implementation of the JBIG2 image compression format"; description = "Decoder implementation of the JBIG2 image compression format";
license = stdenv.lib.licenses.gpl2Plus; license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;