From 2af5e7026e896cd11c515062f8810e285c2587e5 Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com>
Date: Mon, 21 Oct 2024 00:49:01 +0300
Subject: [PATCH 1/4] janus-gateway: fix build

---
 pkgs/servers/janus-gateway/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/servers/janus-gateway/default.nix b/pkgs/servers/janus-gateway/default.nix
index 9a0ecad23dd4..3d44258dd70f 100644
--- a/pkgs/servers/janus-gateway/default.nix
+++ b/pkgs/servers/janus-gateway/default.nix
@@ -44,6 +44,9 @@ stdenv.mkDerivation rec {
 
   makeFlags = [
     "BORINGSSL_LIBS=-L${lib.getLib boringssl}/lib"
+    # Linking with CXX because boringssl static libraries depend on C++ stdlib.
+    # Upstream issue: https://www.github.com/meetecho/janus-gateway/issues/3456
+    "CCLD=${stdenv.cc.targetPrefix}c++"
   ];
 
   outputs = [ "out" "dev" "doc" "man" ];

From e0fb473795943afa07358de90efaaeb6be5623e6 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 23 Oct 2024 16:30:52 +0200
Subject: [PATCH 2/4] janus-gateway: reformat with nixfmt-rfc-style

---
 pkgs/servers/janus-gateway/default.nix | 58 ++++++++++++++++++++++----
 1 file changed, 50 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/janus-gateway/default.nix b/pkgs/servers/janus-gateway/default.nix
index 3d44258dd70f..f757429fbca1 100644
--- a/pkgs/servers/janus-gateway/default.nix
+++ b/pkgs/servers/janus-gateway/default.nix
@@ -1,7 +1,26 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gengetopt
-, glib, libconfig, libnice, jansson, boringssl, zlib, srtp, libuv
-, libmicrohttpd, curl, libwebsockets, sofia_sip, libogg, libopus
-, usrsctp, ffmpeg
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+  pkg-config,
+  gengetopt,
+  glib,
+  libconfig,
+  libnice,
+  jansson,
+  boringssl,
+  zlib,
+  srtp,
+  libuv,
+  libmicrohttpd,
+  curl,
+  libwebsockets,
+  sofia_sip,
+  libogg,
+  libopus,
+  usrsctp,
+  ffmpeg,
 }:
 
 let
@@ -24,11 +43,29 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-3o9XxxTlWppq1mFgIUjstUFz6bT44mvBJa4FBgcc4Pc=";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkg-config gengetopt ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    gengetopt
+  ];
 
   buildInputs = [
-    glib libconfig libnice jansson boringssl zlib srtp libuv libmicrohttpd
-    curl libwebsockets_janus sofia_sip libogg libopus usrsctp ffmpeg
+    glib
+    libconfig
+    libnice
+    jansson
+    boringssl
+    zlib
+    srtp
+    libuv
+    libmicrohttpd
+    curl
+    libwebsockets_janus
+    sofia_sip
+    libogg
+    libopus
+    usrsctp
+    ffmpeg
   ];
 
   enableParallelBuilding = true;
@@ -49,7 +86,12 @@ stdenv.mkDerivation rec {
     "CCLD=${stdenv.cc.targetPrefix}c++"
   ];
 
-  outputs = [ "out" "dev" "doc" "man" ];
+  outputs = [
+    "out"
+    "dev"
+    "doc"
+    "man"
+  ];
 
   postInstall = ''
     moveToOutput share/janus "$doc"

From ff111f8105bf28d23615ee8bcf42b420553a5b6e Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 23 Oct 2024 16:32:37 +0200
Subject: [PATCH 3/4] janus-gateway: move to by-name

---
 .../default.nix => by-name/ja/janus-gateway/package.nix}        | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{servers/janus-gateway/default.nix => by-name/ja/janus-gateway/package.nix} (100%)

diff --git a/pkgs/servers/janus-gateway/default.nix b/pkgs/by-name/ja/janus-gateway/package.nix
similarity index 100%
rename from pkgs/servers/janus-gateway/default.nix
rename to pkgs/by-name/ja/janus-gateway/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d5cb22997c57..ab4ea015106b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24362,8 +24362,6 @@ with pkgs;
 
   ircdHybrid = callPackage ../servers/irc/ircd-hybrid { };
 
-  janus-gateway = callPackage ../servers/janus-gateway { };
-
   janusgraph = callPackage ../servers/nosql/janusgraph { };
 
   jboss = callPackage ../servers/http/jboss { };

From f3138af886348f963187150f2941b8ec306c6c63 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 23 Oct 2024 16:43:28 +0200
Subject: [PATCH 4/4] janus-gateway: 1.2.3 -> 1.2.4

---
 pkgs/by-name/ja/janus-gateway/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ja/janus-gateway/package.nix b/pkgs/by-name/ja/janus-gateway/package.nix
index f757429fbca1..dadd67e735cf 100644
--- a/pkgs/by-name/ja/janus-gateway/package.nix
+++ b/pkgs/by-name/ja/janus-gateway/package.nix
@@ -34,13 +34,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "janus-gateway";
-  version = "1.2.3";
+  version = "1.2.4";
 
   src = fetchFromGitHub {
     owner = "meetecho";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-3o9XxxTlWppq1mFgIUjstUFz6bT44mvBJa4FBgcc4Pc=";
+    sha256 = "sha256-oUX9PxiNdmrC03p+DAGkxD+mbi2jzuCgwlgd2JZ4Gwo=";
   };
 
   nativeBuildInputs = [