BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #201125 from LibreCybernetics/dbeaver-changes

Browse source
This commit is contained in:
Sandro 2022-11-20 07:03:15 +01:00 committed by GitHub
commit 4f8c39c892
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/misc/dbeaver/default.nix
View file

@ -14,7 +14,7 @@
, libXtst , libXtst
, zlib , zlib
, maven , maven
, webkitgtk , webkitgtk_4_1
, glib-networking , glib-networking
, javaPackages , javaPackages
}: }:
@ -52,7 +52,7 @@
libXtst libXtst
zlib zlib
] ++ lib.optionals stdenv.isLinux [ ] ++ lib.optionals stdenv.isLinux [
webkitgtk webkitgtk_4_1
glib-networking glib-networking
]; ];
@ -108,7 +108,7 @@
makeWrapper $out/dbeaver/dbeaver $out/bin/dbeaver \ makeWrapper $out/dbeaver/dbeaver $out/bin/dbeaver \
--prefix PATH : ${jdk}/bin \ --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 GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"

10
pkgs/top-level/all-packages.nix
View file

@ -5784,15 +5784,7 @@ with pkgs;
davfs2 = callPackage ../tools/filesystems/davfs2 { }; davfs2 = callPackage ../tools/filesystems/davfs2 { };
dbeaver = callPackage ../applications/misc/dbeaver { 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;
};
};
dbench = callPackage ../development/tools/misc/dbench { }; dbench = callPackage ../development/tools/misc/dbench { };