dbeaver: fix build (jdk → jdk17)
There is currently a build issue with jdk19 (the new default from 17 after 2022-11-30; https://github.com/NixOS/nixpkgs/pull/199802)
This commit is contained in:
parent
d797db230d
commit
fe39068e04
@ -8,7 +8,7 @@
|
||||
, freetype
|
||||
, glib
|
||||
, gtk3
|
||||
, jdk
|
||||
, jdk17
|
||||
, libX11
|
||||
, libXrender
|
||||
, libXtst
|
||||
@ -46,7 +46,7 @@
|
||||
freetype
|
||||
glib
|
||||
gtk3
|
||||
jdk
|
||||
jdk17
|
||||
libX11
|
||||
libXrender
|
||||
libXtst
|
||||
@ -92,8 +92,8 @@
|
||||
ln -s $out/Applications/DBeaver.app/Contents/MacOS/dbeaver $out/bin/dbeaver
|
||||
|
||||
wrapProgram $out/Applications/DBeaver.app/Contents/MacOS/dbeaver \
|
||||
--prefix JAVA_HOME : ${jdk.home} \
|
||||
--prefix PATH : ${jdk}/bin
|
||||
--prefix JAVA_HOME : ${jdk17.home} \
|
||||
--prefix PATH : ${jdk17}/bin
|
||||
|
||||
runHook postInstall
|
||||
'' else ''
|
||||
@ -107,7 +107,7 @@
|
||||
patchelf --set-interpreter $interpreter $out/dbeaver/dbeaver
|
||||
|
||||
makeWrapper $out/dbeaver/dbeaver $out/bin/dbeaver \
|
||||
--prefix PATH : ${jdk}/bin \
|
||||
--prefix PATH : ${jdk17}/bin \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk_4_1 glib-networking ])} \
|
||||
--prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \
|
||||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
|
||||
|
Loading…
Reference in New Issue
Block a user