summary refs log tree commit diff
path: root/pkgs/applications/misc/dbeaver/default.nix
diff options
context:
space:
mode:
authorFabián Heredia Montiel <fabianhjr@protonmail.com>2022-11-30 15:48:13 -0600
committerFabián Heredia Montiel <fabianhjr@protonmail.com>2022-11-30 15:49:01 -0600
commitfe39068e043e78fba7db43cb352609553c7a131a (patch)
treed09cbe0cea2147879ea8d7ce068009349df76b66 /pkgs/applications/misc/dbeaver/default.nix
parentd797db230ded3a26b7daff80e11ac8f14df915da (diff)
downloadnixpkgs-fe39068e043e78fba7db43cb352609553c7a131a.tar
nixpkgs-fe39068e043e78fba7db43cb352609553c7a131a.tar.gz
nixpkgs-fe39068e043e78fba7db43cb352609553c7a131a.tar.bz2
nixpkgs-fe39068e043e78fba7db43cb352609553c7a131a.tar.lz
nixpkgs-fe39068e043e78fba7db43cb352609553c7a131a.tar.xz
nixpkgs-fe39068e043e78fba7db43cb352609553c7a131a.tar.zst
nixpkgs-fe39068e043e78fba7db43cb352609553c7a131a.zip
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)
Diffstat (limited to 'pkgs/applications/misc/dbeaver/default.nix')
-rw-r--r--pkgs/applications/misc/dbeaver/default.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
index e003787efc4..07d0534f073 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -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"