summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOleg Pykhalov <go.wigust@gmail.com>2020-03-27 23:27:16 +0300
committerOleg Pykhalov <go.wigust@gmail.com>2020-03-27 23:27:42 +0300
commit538a679c89eba0e4077ed0c621bdb87fa59f6e8e (patch)
treec4f013419008bb41fa4d4ea3fd6379f57f399eaf
parentjdk: Add commented oracle java. (diff)
downloadnixpkgs-538a679c89eba0e4077ed0c621bdb87fa59f6e8e.tar.gz
jdk.nix: Switch to oracle java.
-rw-r--r--jdk.nix10
1 files changed, 6 insertions, 4 deletions
diff --git a/jdk.nix b/jdk.nix
index 8803bb48ec21..1e25c5982c6f 100644
--- a/jdk.nix
+++ b/jdk.nix
@@ -33,14 +33,16 @@ let
mj-jdk7 = nixpkgsJdk7.jdk7.override ({ inherit cacert; });
-
# LANG=/gnu/store/03nvilh2x4z07dxv7h13gh986vvgpnsf-glibc-locales-2.29/lib/locale/2.29/en_US.UTF-8 /nix/store/2rmmbj648vmim0qa9fc0ksqsbghb8ifq-oraclejdk-7u75/bin/jcontrol
#
# # XXX: oracle java
- # mj-adoptopenjdk-icedtea-web7 = (import (builtins.fetchTarball {url = "https://github.com/nixos/nixpkgs/archive/86062d7a952c9e8cdb0b370cedf1b010e0864bb4.tar.gz";}) { config = { allowUnfree = true; }; }).oraclejdk7;
+ mj-adoptopenjdk-icedtea-web7 = (import (builtins.fetchTarball {
+ url =
+ "https://github.com/nixos/nixpkgs/archive/86062d7a952c9e8cdb0b370cedf1b010e0864bb4.tar.gz";
+ }) { config = { allowUnfree = true; }; }).oraclejdk7;
- mj-adoptopenjdk-icedtea-web7 =
- nixpkgsJdk7.icedtea7_web.override { jdk = mj-jdk7; };
+ # mj-adoptopenjdk-icedtea-web7 =
+ # nixpkgsJdk7.icedtea7_web.override { jdk = mj-jdk7; };
mj-wrapFirefox = wrapFirefox.override {
adoptopenjdk-icedtea-web = mj-adoptopenjdk-icedtea-web7;