summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorvolth <volth@webmaster.ms>2017-12-15 09:14:48 +0000
committerGitHub <noreply@github.com>2017-12-15 09:14:48 +0000
commit4021a5d6c1d6d61eb79a531f7fc4a1b52a583210 (patch)
treed8ce9cdc24b9fecdb6034bc6a3941ec3a75d4b2f /pkgs/applications
parent45121d9dfcde678f8d88aee8fad02c6873510fb9 (diff)
downloadnixlib-4021a5d6c1d6d61eb79a531f7fc4a1b52a583210.tar
nixlib-4021a5d6c1d6d61eb79a531f7fc4a1b52a583210.tar.gz
nixlib-4021a5d6c1d6d61eb79a531f7fc4a1b52a583210.tar.bz2
nixlib-4021a5d6c1d6d61eb79a531f7fc4a1b52a583210.tar.lz
nixlib-4021a5d6c1d6d61eb79a531f7fc4a1b52a583210.tar.xz
nixlib-4021a5d6c1d6d61eb79a531f7fc4a1b52a583210.tar.zst
nixlib-4021a5d6c1d6d61eb79a531f7fc4a1b52a583210.zip
firefox-wrapper: restore supportsJDK removed from all-packages.nix
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/networking/browsers/firefox/wrapper.nix5
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 4c3647bd4481..59b6d9b016ce 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -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);