@@ -1,4 +1,4 @@
1−{ stdenv, requireFile, perl, unzip, glibc, zlib, gdk_pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsaLib, libav_0_8, setJavaClassPath }:
1+{ stdenv, requireFile, perl, unzip, glibc, zlib, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsaLib, libav_0_8, setJavaClassPath }:
22
33let
44 graalvm8-ee = stdenv.mkDerivation rec {
@@ -68,14 +68,7 @@ let
6868
6969 dontStrip = true;
7070
71− # copy-paste openjdk's preFixup
7271 preFixup = ''
73− # Propagate the setJavaClassPath setup hook from the JRE so that
74− # any package that depends on the JRE has $CLASSPATH set up
75− # properly.
76− mkdir -p $out/nix-support
77− printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
78−
7972 # Set JAVA_HOME automatically.
8073 mkdir -p $out/nix-support
8174 cat <<EOF > $out/nix-support/setup-hook
@@ -86,7 +79,7 @@ let
8679 postFixup = ''
8780 rpath="$out/jre/lib/amd64/jli:$out/jre/lib/amd64/server:$out/jre/lib/amd64:${
8881 stdenv.lib.strings.makeLibraryPath [ glibc xorg.libXxf86vm xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender
89− glib zlib alsaLib fontconfig freetype pango gtk3 gtk2 cairo gdk_pixbuf atk ffmpeg libGL ]}"
82+ glib zlib alsaLib fontconfig freetype pango gtk3 gtk2 cairo gdk-pixbuf atk ffmpeg libGL ]}"
9083
9184 for f in $(find $out -type f -perm -0100); do
9285 patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true
@@ -98,7 +91,7 @@ let
9891 done
9992 '';
10093
101− propagatedBuildInputs = [ zlib ]; # $out/bin/native-image needs zlib to build native executables
94+ propagatedBuildInputs = [ setJavaClassPath zlib ]; # $out/bin/native-image needs zlib to build native executables
10295
10396 doInstallCheck = true;
10497 installCheckPhase = ''