diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-12-17 18:01:35 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-17 18:01:35 +0000 |
| commit | 887e342eaa0c190d3c2236970899d7a060c9209e (patch) | |
| tree | dfd16ab1cb7d0a6c5b5ef5697593985e8a0e9cc9 /pkgs/development/compilers/openjdk/19.nix | |
| parent | 1fe4ad36e772de72ef4bb28a235dfc15f8e39a8d (diff) | |
| parent | 9c81bc3074dad0c8789088ed6d6d460f3d08f7d2 (diff) | |
| download | nixpkgs-887e342eaa0c190d3c2236970899d7a060c9209e.tar nixpkgs-887e342eaa0c190d3c2236970899d7a060c9209e.tar.gz nixpkgs-887e342eaa0c190d3c2236970899d7a060c9209e.tar.bz2 nixpkgs-887e342eaa0c190d3c2236970899d7a060c9209e.tar.lz nixpkgs-887e342eaa0c190d3c2236970899d7a060c9209e.tar.xz nixpkgs-887e342eaa0c190d3c2236970899d7a060c9209e.tar.zst nixpkgs-887e342eaa0c190d3c2236970899d7a060c9209e.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/compilers/openjdk/19.nix')
| -rw-r--r-- | pkgs/development/compilers/openjdk/19.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/development/compilers/openjdk/19.nix b/pkgs/development/compilers/openjdk/19.nix index 9537b0d3ce5..1af3c920b2c 100644 --- a/pkgs/development/compilers/openjdk/19.nix +++ b/pkgs/development/compilers/openjdk/19.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchFromGitHub, bash, pkg-config, autoconf, cpio +{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitHub, bash, pkg-config, autoconf, cpio , file, which, unzip, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib , libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst , libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk19-bootstrap @@ -51,6 +51,13 @@ let url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; }) + + # Patch borrowed from Alpine to fix build errors with musl libc and recent gcc. + # This is applied anywhere to prevent patchrot. + (fetchpatch { + url = "https://git.alpinelinux.org/aports/plain/testing/openjdk19/FixNullPtrCast.patch?id=b93d1fc37fcf106144958d957bb97c7db67bd41f"; + hash = "sha256-cnpeYcVoRYjuDgrl2x27frv6KUAnu1+1MVPehPZy/Cg="; + }) ] ++ lib.optionals (!headless && enableGnome2) [ ./swing-use-gtk-jdk13.patch ]; |