diff options
| author | Alyssa Ross <hi@alyssa.is> | 2018-12-13 11:45:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-13 11:45:21 +0000 |
| commit | c5b825ca287b20117633b23f6048d019ee09422c (patch) | |
| tree | 8c1ad017a96a4f6017adcbecc53e21015b506c09 /pkgs | |
| parent | bb14e3b1fbf7cb1a12593ee579f094d796def674 (diff) | |
| parent | a9c43dd9ef088e71b9074a81fca179ba370c63cc (diff) | |
| download | nixlib-c5b825ca287b20117633b23f6048d019ee09422c.tar nixlib-c5b825ca287b20117633b23f6048d019ee09422c.tar.gz nixlib-c5b825ca287b20117633b23f6048d019ee09422c.tar.bz2 nixlib-c5b825ca287b20117633b23f6048d019ee09422c.tar.lz nixlib-c5b825ca287b20117633b23f6048d019ee09422c.tar.xz nixlib-c5b825ca287b20117633b23f6048d019ee09422c.tar.zst nixlib-c5b825ca287b20117633b23f6048d019ee09422c.zip | |
Merge pull request #51860 from ivan/fix-jdk11_headless
jdk11_headless: fix the build on amd64
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/openjdk/11.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index af383b2f05e1..42208ecf8d95 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -67,8 +67,8 @@ let # 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" '' - + lib.optionalString (architecture == "amd64") "\"--with-jvm-features=zgc\"" - + lib.optionalString minimal "\"--enable-headless-only\"" + + lib.optionalString (architecture == "amd64") " \"--with-jvm-features=zgc\"" + + lib.optionalString minimal " \"--enable-headless-only\"" + ");" # https://bugzilla.redhat.com/show_bug.cgi?id=1306558 # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716 |