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

openjdk11: build fixes

Browse Source 
* 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
This commit is contained in:
Matt McHenry 2019-07-24 13:10:05 -04:00
parent 9d9eb87c19
commit 0d9e842890
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/compilers/openjdk/11.nix
View File

@ -44,6 +44,7 @@ let
./fix-java-home-jdk10.patch ./fix-java-home-jdk10.patch
./read-truststore-from-env-jdk10.patch ./read-truststore-from-env-jdk10.patch
./currency-date-range-jdk10.patch ./currency-date-range-jdk10.patch
./increase-javadoc-heap.patch
] ++ lib.optionals (!minimal && enableGnome2) [ ] ++ lib.optionals (!minimal && enableGnome2) [
./swing-use-gtk-jdk10.patch ./swing-use-gtk-jdk10.patch
]; ];

12
pkgs/development/compilers/openjdk/increase-javadoc-heap.patch Normal file
View File

@ -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

2
pkgs/development/compilers/openjdk/openjfx/11.nix
View File

@ -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) # 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 = '' 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' \ | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
| sh | sh
rm -rf $out/tmp rm -rf $out/tmp