diff options
| author | Matt McHenry <github@matt.mchenryfamily.org> | 2019-07-24 13:10:05 -0400 |
|---|---|---|
| committer | Matt McHenry <github@matt.mchenryfamily.org> | 2019-07-25 15:35:50 -0400 |
| commit | 0d9e84289012a1fcf4aa324caf6049f960c715f3 (patch) | |
| tree | 5100912fac241bd47495c685454dba58e703282a /pkgs/development/compilers/openjdk | |
| parent | 9d9eb87c196e7164201e9cc96f0c16bdc41859fb (diff) | |
| download | nixpkgs-0d9e84289012a1fcf4aa324caf6049f960c715f3.tar nixpkgs-0d9e84289012a1fcf4aa324caf6049f960c715f3.tar.gz nixpkgs-0d9e84289012a1fcf4aa324caf6049f960c715f3.tar.bz2 nixpkgs-0d9e84289012a1fcf4aa324caf6049f960c715f3.tar.lz nixpkgs-0d9e84289012a1fcf4aa324caf6049f960c715f3.tar.xz nixpkgs-0d9e84289012a1fcf4aa324caf6049f960c715f3.tar.zst nixpkgs-0d9e84289012a1fcf4aa324caf6049f960c715f3.zip | |
openjdk11: build fixes
* increase heap size for building javadoc (this is only needed for the 32-bit build) * filter out some non-maven jars that crop up in the openjfx build
Diffstat (limited to 'pkgs/development/compilers/openjdk')
| -rw-r--r-- | pkgs/development/compilers/openjdk/11.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/compilers/openjdk/increase-javadoc-heap.patch | 12 | ||||
| -rw-r--r-- | pkgs/development/compilers/openjdk/openjfx/11.nix | 2 |
3 files changed, 14 insertions, 1 deletions
diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index 3f593dbcd6d..7ccbfb6351d 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -44,6 +44,7 @@ let ./fix-java-home-jdk10.patch ./read-truststore-from-env-jdk10.patch ./currency-date-range-jdk10.patch + ./increase-javadoc-heap.patch ] ++ lib.optionals (!minimal && enableGnome2) [ ./swing-use-gtk-jdk10.patch ]; diff --git a/pkgs/development/compilers/openjdk/increase-javadoc-heap.patch b/pkgs/development/compilers/openjdk/increase-javadoc-heap.patch new file mode 100644 index 00000000000..6a1b253f913 --- /dev/null +++ b/pkgs/development/compilers/openjdk/increase-javadoc-heap.patch @@ -0,0 +1,12 @@ +--- a/make/Docs.gmk 2019-07-24 13:07:37.013405090 -0400 ++++ b/make/Docs.gmk 2019-07-24 13:07:28.406550535 -0400 +@@ -274,7 +274,7 @@ + $1_INDIRECT_EXPORTS := $$(call FindTransitiveIndirectDepsForModules, $$($1_MODULES)) + $1_ALL_MODULES := $$(sort $$($1_MODULES) $$($1_INDIRECT_EXPORTS)) + +- $1_JAVA_ARGS := -Dextlink.spec.version=$$(VERSION_SPECIFICATION) ++ $1_JAVA_ARGS := -Dextlink.spec.version=$$(VERSION_SPECIFICATION) -Xmx1G + + ifeq ($$(ENABLE_FULL_DOCS), true) + # Tell the ModuleGraph taglet to generate html links to soon-to-be-created + diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix index 4ee007281e2..a2b28d2dbf8 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -48,7 +48,7 @@ let # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) installPhase = '' - find $GRADLE_USER_HOME -type f -regex '.*\.\(jar\|pom\)' \ + find $GRADLE_USER_HOME -type f -regex '.*/modules.*\.\(jar\|pom\)' \ | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ | sh rm -rf $out/tmp |