diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-03-08 13:06:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-08 13:06:11 +0100 |
| commit | a1fae9555d0cc56243915ffcef6108bd6edb971d (patch) | |
| tree | ab71a394832bd9839b123966df54a4b6aaa381cb /pkgs/development/compilers | |
| parent | 89d56ddd5bf9d731f6d723aa4b4f374ecc4b80e4 (diff) | |
| parent | b7869ed9a054d4eb08c26bf2e2f6e3f4eee813e8 (diff) | |
| download | nixlib-a1fae9555d0cc56243915ffcef6108bd6edb971d.tar nixlib-a1fae9555d0cc56243915ffcef6108bd6edb971d.tar.gz nixlib-a1fae9555d0cc56243915ffcef6108bd6edb971d.tar.bz2 nixlib-a1fae9555d0cc56243915ffcef6108bd6edb971d.tar.lz nixlib-a1fae9555d0cc56243915ffcef6108bd6edb971d.tar.xz nixlib-a1fae9555d0cc56243915ffcef6108bd6edb971d.tar.zst nixlib-a1fae9555d0cc56243915ffcef6108bd6edb971d.zip | |
Merge pull request #294241 from wegank/zulu-javafx-linux
zulu: fix build with javafx on linux
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/zulu/common.nix | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/pkgs/development/compilers/zulu/common.nix b/pkgs/development/compilers/zulu/common.nix index 75925ed81bec..c9056236ea6a 100644 --- a/pkgs/development/compilers/zulu/common.nix +++ b/pkgs/development/compilers/zulu/common.nix @@ -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 |