diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-12-16 23:20:45 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-16 23:20:45 -0800 |
| commit | 0643952fa56cd00b708cf37d65ba531b72c6e95d (patch) | |
| tree | 6dee13f33d9ec8ffcc5b87911d72405b4e8c7f8b /pkgs/applications | |
| parent | 28541e2a3f6783ea6fd66256707c0dfdf969d8a1 (diff) | |
| parent | 6b2a80a1fc2ab336d8f97cef40f7e3d740d4c56b (diff) | |
| download | nixlib-0643952fa56cd00b708cf37d65ba531b72c6e95d.tar nixlib-0643952fa56cd00b708cf37d65ba531b72c6e95d.tar.gz nixlib-0643952fa56cd00b708cf37d65ba531b72c6e95d.tar.bz2 nixlib-0643952fa56cd00b708cf37d65ba531b72c6e95d.tar.lz nixlib-0643952fa56cd00b708cf37d65ba531b72c6e95d.tar.xz nixlib-0643952fa56cd00b708cf37d65ba531b72c6e95d.tar.zst nixlib-0643952fa56cd00b708cf37d65ba531b72c6e95d.zip | |
Merge pull request #32375 from volth/oracle-jdk-remove-redundand-asserts
oraclejdk: remove redundant asserts
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/wrapper.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 4c3647bd4481..dd4cb439c1fa 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -3,7 +3,7 @@ ## various stuff that can be plugged in , flashplayer, hal-flash , MPlayerPlugin, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra_gtk2 -, supportsJDK, jrePlugin, icedtea_web +, jrePlugin, icedtea_web , trezor-bridge, bluejeans, djview4, adobe-reader , google_talk_plugin, fribid, gnome3/*.gnome_shell*/ , esteidfirefoxplugin @@ -36,6 +36,11 @@ let gssSupport = browser.gssSupport or false; jre = cfg.jre or false; icedtea = cfg.icedtea or false; + supportsJDK = + stdenv.system == "i686-linux" || + stdenv.system == "x86_64-linux" || + stdenv.system == "armv7l-linux" || + stdenv.system == "aarch64-linux"; plugins = assert !(jre && icedtea); |