diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-11-20 07:03:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-20 07:03:15 +0100 |
| commit | 4f8c39c89239600e802009c266534767164097de (patch) | |
| tree | ee93ffb70d299fedba2124efa90feb57e874cfc1 | |
| parent | d63fe42e911db769e5dbdbabdf8728647f789cd0 (diff) | |
| parent | 843734a265b0dfba3a1b87c4a7d644b10c4dd2e9 (diff) | |
Merge pull request #201125 from LibreCybernetics/dbeaver-changes
| -rw-r--r-- | pkgs/applications/misc/dbeaver/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
2 files changed, 4 insertions, 12 deletions
diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index ceb1b9833c928..e003787efc460 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -14,7 +14,7 @@ , libXtst , zlib , maven -, webkitgtk +, webkitgtk_4_1 , glib-networking , javaPackages }: @@ -52,7 +52,7 @@ libXtst zlib ] ++ lib.optionals stdenv.isLinux [ - webkitgtk + webkitgtk_4_1 glib-networking ]; @@ -108,7 +108,7 @@ makeWrapper $out/dbeaver/dbeaver $out/bin/dbeaver \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk glib-networking ])} \ + --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" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ecbd99fb644b5..0257201482898 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5784,15 +5784,7 @@ with pkgs; davfs2 = callPackage ../tools/filesystems/davfs2 { }; - dbeaver = callPackage ../applications/misc/dbeaver { - jdk = jdk11; # AlgorithmId.md5WithRSAEncryption_oid was removed in jdk15 - - # TODO: remove once maven uses JDK 11 - # error: org/eclipse/tycho/core/p2/P2ArtifactRepositoryLayout has been compiled by a more recent version of the Java Runtime (class file version 55.0), this version of the Java Runtime only recognizes class file versions up to 52.0 - maven = maven.override { - jdk = jdk11; - }; - }; + dbeaver = callPackage ../applications/misc/dbeaver { }; dbench = callPackage ../development/tools/misc/dbench { }; |