openjdk: 14.0.2 -> 15.0.1
* update two explicit references to jdk14 to just jdk, which no longer points at jdk8 after #89731. * patch an explicit -XX:+UseConcMarkSweepGC to -XX:UseG1GC, as the former now throws an error (after having been deprecated since jdk 9)
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, jdk14, makeWrapper, autoPatchelfHook, makeDesktopItem, glib, libsecret }:
|
||||
{ stdenv, fetchurl, jdk, makeWrapper, autoPatchelfHook, makeDesktopItem, glib, libsecret }:
|
||||
|
||||
let
|
||||
desktopItem = makeDesktopItem {
|
||||
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
makeWrapper "$dest/ApacheDirectoryStudio" \
|
||||
"$out/bin/ApacheDirectoryStudio" \
|
||||
--prefix PATH : "${jdk14}/bin"
|
||||
--prefix PATH : "${jdk}/bin"
|
||||
install -D icon.xpm "$out/share/pixmaps/apache-directory-studio.xpm"
|
||||
install -D -t "$out/share/applications" ${desktopItem}/share/applications/*
|
||||
'';
|
||||
|
||||
Reference in New Issue
Block a user