Merge pull request #148640 from jojosch/dbeaver-webkit

This commit is contained in:
Maciej Krüger 2021-12-06 05:33:26 +01:00 committed by GitHub
commit 3f32588bb8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -14,6 +14,8 @@
, libXtst
, zlib
, maven
, webkitgtk
, glib-networking
}:
stdenv.mkDerivation rec {
@ -69,6 +71,9 @@ stdenv.mkDerivation rec {
libXrender
libXtst
zlib
] ++ lib.optionals stdenv.isLinux [
webkitgtk
glib-networking
];
desktopItems = [
@ -130,7 +135,8 @@ stdenv.mkDerivation rec {
makeWrapper $out/dbeaver/dbeaver $out/bin/dbeaver \
--prefix PATH : ${jdk}/bin \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst ])} \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk glib-networking ])} \
--prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
mkdir -p $out/share/pixmaps