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

firefox-wrapper: restore supportsJDK removed from all-packages.nix

Browse Source
This commit is contained in:
volth 2017-12-15 09:14:48 +00:00 committed by GitHub
parent 45121d9dfc
commit 4021a5d6c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 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

@ -36,6 +36,11 @@ let
gssSupport = browser.gssSupport or false; gssSupport = browser.gssSupport or false;
jre = cfg.jre or false; jre = cfg.jre or false;
icedtea = cfg.icedtea 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 = plugins =
assert !(jre && icedtea); assert !(jre && icedtea);