diff --git a/pkgs/servers/janus-gateway/default.nix b/pkgs/by-name/ja/janus-gateway/package.nix similarity index 55% rename from pkgs/servers/janus-gateway/default.nix rename to pkgs/by-name/ja/janus-gateway/package.nix index 9a0ecad23dd4..dadd67e735cf 100644 --- a/pkgs/servers/janus-gateway/default.nix +++ b/pkgs/by-name/ja/janus-gateway/package.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 @@ -15,20 +34,38 @@ 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 = [ 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; @@ -44,9 +81,17 @@ 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" ]; + outputs = [ + "out" + "dev" + "doc" + "man" + ]; postInstall = '' moveToOutput share/janus "$doc" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ef5d30b80d4..6449b5d2e024 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24368,8 +24368,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 { };