JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #203808 from LibreCybernetics/fix-dbeaver

Browse Source 
dbeaver: fix build (jdk → jdk17)
This commit is contained in:
figsoda 2022-11-30 20:21:35 -05:00 committed by GitHub
commit 6810ef7ada
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/misc/dbeaver/default.nix
View File

@ -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"