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

Merge pull request #51860 from ivan/fix-jdk11_headless

Browse Source 
jdk11_headless: fix the build on amd64
This commit is contained in:
Alyssa Ross 2018-12-13 11:45:21 +00:00 committed by GitHub
commit c5b825ca28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,8 +67,8 @@ let
# See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html
"--with-extra-cflags=-Wno-error=deprecated-declarations -Wno-error=format-contains-nul -Wno-error=unused-result" "--with-extra-cflags=-Wno-error=deprecated-declarations -Wno-error=format-contains-nul -Wno-error=unused-result"
'' ''
+ lib.optionalString (architecture == "amd64") "\"--with-jvm-features=zgc\"" + lib.optionalString (architecture == "amd64") " \"--with-jvm-features=zgc\""
+ lib.optionalString minimal "\"--enable-headless-only\"" + lib.optionalString minimal " \"--enable-headless-only\""
+ ");" + ");"
# https://bugzilla.redhat.com/show_bug.cgi?id=1306558 # https://bugzilla.redhat.com/show_bug.cgi?id=1306558
# https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716 # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716