diff options
| author | Matt McHenry <github@matt.mchenryfamily.org> | 2020-10-01 09:36:31 -0400 |
|---|---|---|
| committer | Matt McHenry <github@matt.mchenryfamily.org> | 2020-12-26 11:58:06 -0500 |
| commit | 13e3d2bc4bcef95e2ac0f1bb90581066f2e71b71 (patch) | |
| tree | 2d96e85261f9c182dc1f9d2bd53a34f64518dd1f /pkgs/servers/jitsi-videobridge | |
| parent | e9158eca70ae59e73fae23be5d13d3fa0cfc78b4 (diff) | |
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)
Diffstat (limited to 'pkgs/servers/jitsi-videobridge')
| -rw-r--r-- | pkgs/servers/jitsi-videobridge/default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/servers/jitsi-videobridge/default.nix b/pkgs/servers/jitsi-videobridge/default.nix index 37cffa2e92065..09d7af185615e 100644 --- a/pkgs/servers/jitsi-videobridge/default.nix +++ b/pkgs/servers/jitsi-videobridge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dpkg, jre_headless, nixosTests }: +{ stdenv, fetchurl, makeWrapper, dpkg, jre_headless, nixosTests }: let pname = "jitsi-videobridge2"; @@ -15,6 +15,8 @@ stdenv.mkDerivation { unpackCmd = "${dpkg}/bin/dpkg-deb -x $src debcontents"; + buildInputs = [ makeWrapper ]; + installPhase = '' substituteInPlace usr/share/jitsi-videobridge/jvb.sh \ --replace "exec java" "exec ${jre_headless}/bin/java" @@ -24,6 +26,10 @@ stdenv.mkDerivation { cp ${./logging.properties-journal} $out/etc/jitsi/videobridge/logging.properties-journal mv usr/share/jitsi-videobridge/* $out/share/jitsi-videobridge/ ln -s $out/share/jitsi-videobridge/jvb.sh $out/bin/jitsi-videobridge + + # work around https://github.com/jitsi/jitsi-videobridge/issues/1547 + wrapProgram $out/bin/jitsi-videobridge \ + --set VIDEOBRIDGE_GC_TYPE G1GC ''; passthru.tests = { |