diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-03-22 16:41:59 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-03-22 16:41:59 +0100 |
| commit | 46a88117a05c3469af5d99433af140c3de8ca088 (patch) | |
| tree | d7f0557756d8f07a3081b3498c05ddc5a8ad429d /nixpkgs/pkgs/development/compilers/zulu/common.nix | |
| parent | e97457545cea0b2ca421da257c83d8f1ef451d85 (diff) | |
| parent | a343533bccc62400e8a9560423486a3b6c11a23b (diff) | |
| download | nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.gz nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.bz2 nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.lz nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.xz nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.zst nixlib-46a88117a05c3469af5d99433af140c3de8ca088.zip | |
Merge commit 'a343533bccc62400e8a9560423486a3b6c11a23b'
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/zulu/common.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/zulu/common.nix | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/development/compilers/zulu/common.nix b/nixpkgs/pkgs/development/compilers/zulu/common.nix index 75925ed81bec..c9056236ea6a 100644 --- a/nixpkgs/pkgs/development/compilers/zulu/common.nix +++ b/nixpkgs/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 |