summary refs log tree commit diff
path: root/pkgs/development/compilers/openjdk/12.nix
diff options
context:
space:
mode:
authorEdward Tjörnhammar <ed@cflags.cc>2023-09-18 23:08:30 +0200
committerEdward Tjörnhammar <ed@cflags.cc>2023-09-19 07:00:33 +0200
commitb88fa28cce63ab3693c81d6f7e602a9c24d79844 (patch)
tree32bc809f6ab6be7c402837d063ef29aa8ef7bb47 /pkgs/development/compilers/openjdk/12.nix
parentb7e68243306833845cbf92e2ea1e0cf782481a51 (diff)
downloadnixpkgs-b88fa28cce63ab3693c81d6f7e602a9c24d79844.tar
nixpkgs-b88fa28cce63ab3693c81d6f7e602a9c24d79844.tar.gz
nixpkgs-b88fa28cce63ab3693c81d6f7e602a9c24d79844.tar.bz2
nixpkgs-b88fa28cce63ab3693c81d6f7e602a9c24d79844.tar.lz
nixpkgs-b88fa28cce63ab3693c81d6f7e602a9c24d79844.tar.xz
nixpkgs-b88fa28cce63ab3693c81d6f7e602a9c24d79844.tar.zst
nixpkgs-b88fa28cce63ab3693c81d6f7e602a9c24d79844.zip
openjdk1{2,3,4,5,6,8}: quickfix, add images build
buildFlags doesn't properly take and need to be manually applied in postBuild,
in some cases.. harfbuzz is also unreliantly thrown.

Mark 1{3,4} as broken.
Diffstat (limited to 'pkgs/development/compilers/openjdk/12.nix')
-rw-r--r--pkgs/development/compilers/openjdk/12.nix11
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix
index e717a910f70..ab0696e172c 100644
--- a/pkgs/development/compilers/openjdk/12.nix
+++ b/pkgs/development/compilers/openjdk/12.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip
-, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2
+, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2
 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
 , libXcursor, libXrandr, fontconfig, openjdk11-bootstrap, fetchpatch
 , setJavaClassPath
@@ -27,7 +27,7 @@ let
 
     nativeBuildInputs = [ pkg-config autoconf unzip ];
     buildInputs = [
-      cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib
+      cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib
       libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
       libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
     ] ++ lib.optionals (!headless && enableGnome2) [
@@ -67,7 +67,6 @@ let
       "--enable-unlimited-crypto"
       "--with-native-debug-symbols=internal"
       "--with-freetype=system"
-      "--with-harfbuzz=system"
       "--with-libjpeg=system"
       "--with-giflib=system"
       "--with-libpng=system"
@@ -96,6 +95,12 @@ let
 
     buildFlags = [ "all" ];
 
+    postBuild = ''
+      cd build/linux*
+      make images
+      cd -
+    '';
+
     installPhase = ''
       mkdir -p $out/lib