diff options
| author | Peter Simons <simons@cryp.to> | 2014-12-12 09:22:15 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2014-12-12 09:22:15 +0100 |
| commit | 46b0c68ea2c63e0fb0279e4f230170ac94d34efc (patch) | |
| tree | d9aaf2a4658761b0e04a1e8ff24de2ca3eb035a3 /pkgs/development/compilers | |
| parent | 0bdff430a4e804b42cc600bbe3b9b88ea4c86784 (diff) | |
| parent | 95fdc8cf2970b1f94b33afb80bdec374ce237b0d (diff) | |
| download | nixlib-46b0c68ea2c63e0fb0279e4f230170ac94d34efc.tar nixlib-46b0c68ea2c63e0fb0279e4f230170ac94d34efc.tar.gz nixlib-46b0c68ea2c63e0fb0279e4f230170ac94d34efc.tar.bz2 nixlib-46b0c68ea2c63e0fb0279e4f230170ac94d34efc.tar.lz nixlib-46b0c68ea2c63e0fb0279e4f230170ac94d34efc.tar.xz nixlib-46b0c68ea2c63e0fb0279e4f230170ac94d34efc.tar.zst nixlib-46b0c68ea2c63e0fb0279e4f230170ac94d34efc.zip | |
Merge pull request #5282 from rickynils/java-truststore-env
openjdk: Read SSL truststore from JAVAX_NET_SSL_TRUSTSTORE
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/openjdk/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/compilers/openjdk/read-truststore-from-env.patch | 21 |
2 files changed, 27 insertions, 1 deletions
diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index 6a07c7af69e2..3c0ace0ac934 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -61,7 +61,12 @@ stdenv.mkDerivation rec { makeFlagsArray+=(CUPS_HEADERS_PATH=$cupsDir) ''; - patches = [ ./cppflags-include-fix.patch ./fix-java-home.patch ./paxctl.patch ]; + patches = [ + ./cppflags-include-fix.patch + ./fix-java-home.patch + ./paxctl.patch + ./read-truststore-from-env.patch + ]; NIX_NO_SELF_RPATH = true; diff --git a/pkgs/development/compilers/openjdk/read-truststore-from-env.patch b/pkgs/development/compilers/openjdk/read-truststore-from-env.patch new file mode 100644 index 000000000000..8fb0f409d0ab --- /dev/null +++ b/pkgs/development/compilers/openjdk/read-truststore-from-env.patch @@ -0,0 +1,21 @@ +diff -ur openjdk-7u65-b32/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java openjdk-7u65-b32.new/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java +--- openjdk-7u65-b32/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2014-07-17 12:12:14.000000000 +0200 ++++ openjdk-7u65-b32.new/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2014-12-09 13:31:27.821960372 +0100 +@@ -158,6 +158,7 @@ + /* + * Try: + * javax.net.ssl.trustStore (if this variable exists, stop) ++ * system environment variable JAVAX_NET_SSL_TRUSTSTORE + * jssecacerts + * cacerts + * +@@ -165,6 +166,9 @@ + */ + + storeFileName = props.get("trustStore"); ++ if (storeFileName == null) { ++ storeFileName = System.getenv("JAVAX_NET_SSL_TRUSTSTORE"); ++ } + if (!"NONE".equals(storeFileName)) { + if (storeFileName != null) { + storeFile = new File(storeFileName); |