Unverified Commit a1fae955 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #294241 from wegank/zulu-javafx-linux 

zulu: fix build with javafx on linux
parents 89d56ddd b7869ed9

pkgs/development/compilers/zulu/common.nix

+14 −1
Original line number Diff line number Diff line
@@ -19,7 +19,10 @@ 
, gtkSupport ? stdenv.isLinux

, cairo

, glib

, gtk2

, gtk3

  # runtime dependencies for JavaFX

, ffmpeg

}:

let

  dist = dists.${stdenv.hostPlatform.system}
@@ -43,6 +46,10 @@ let 
    cairo

    glib

    gtk3

  ] ++ lib.optionals (gtkSupport && lib.versionOlder dist.jdkVersion "17") [

    gtk2

  ] ++ lib.optionals (stdenv.isLinux && enableJavaFX) [

    ffmpeg.lib

  ];



  runtimeLibraryPath = lib.makeLibraryPath runtimeDependencies;
@@ -83,8 +90,14 @@ let 
      xorg.libXi

      xorg.libXrender

      xorg.libXtst

      xorg.libXxf86vm

      zlib

    ];

    ] ++ lib.optionals (stdenv.isLinux && enableJavaFX) runtimeDependencies;



    autoPatchelfIgnoreMissingDeps = if (stdenv.isLinux && enableJavaFX) then [

      "libavcodec*.so.*"

      "libavformat*.so.*"

    ] else null;



    installPhase = ''

      mkdir -p $out