Compare commits
No commits in common. "1c6b6461755da9466af9a91eea9355540f42ce6c" and "85b0d11461703a74b80a33fd82400b322366c7e9" have entirely different histories.
1c6b646175
...
85b0d11461
|
@ -6,12 +6,14 @@ let
|
||||||
|
|
||||||
in rec {
|
in rec {
|
||||||
|
|
||||||
janus-gateway = callPackage ./pkgs/janus-gateway { };
|
janus-gateway = callPackage ./pkgs/janus-gateway { inherit usrsctp; };
|
||||||
|
|
||||||
nextcloud-spreed-signaling = callPackage ./pkgs/nextcloud-spreed-signaling { };
|
nextcloud-spreed-signaling = callPackage ./pkgs/nextcloud-spreed-signaling { };
|
||||||
|
|
||||||
snipe-it = callPackage ./pkgs/snipe-it { };
|
snipe-it = callPackage ./pkgs/snipe-it { };
|
||||||
|
|
||||||
|
usrsctp = callPackage ./pkgs/usrsctp { };
|
||||||
|
|
||||||
} // optionalAttrs (pkgs.system == "x86_64-linux") {
|
} // optionalAttrs (pkgs.system == "x86_64-linux") {
|
||||||
|
|
||||||
chrysalis-bin = callPackage ./pkgs/chrysalis-bin { };
|
chrysalis-bin = callPackage ./pkgs/chrysalis-bin { };
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
"nodes": {
|
"nodes": {
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1628427351,
|
"lastModified": 1615583000,
|
||||||
"narHash": "sha256-WuZUIQ07AvRw+T9wvQ3qFf8MXmKZ+ktZz9drNgWXDbs=",
|
"narHash": "sha256-ysd3ntUs8qeVuYdmp2Y5J992NVdoKji9i92StU3IJ7M=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "348bc5de8bca09c624f5c4975f538684da4713d2",
|
"rev": "60b18a066e8ce5dd21ebff5324345d3586a67ad9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-21.05-small",
|
"ref": "nixos-20.09-small",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
description = "meterriblecrew.net package flake";
|
description = "meterriblecrew.net package flake";
|
||||||
|
|
||||||
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.05-small";
|
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-20.09-small";
|
||||||
|
|
||||||
outputs = inputs@{ self, nixpkgs }: let
|
outputs = inputs@{ self, nixpkgs }: let
|
||||||
|
|
||||||
|
@ -33,11 +33,10 @@
|
||||||
inherit (localPkgs)
|
inherit (localPkgs)
|
||||||
janus-gateway
|
janus-gateway
|
||||||
nextcloud-spreed-signaling
|
nextcloud-spreed-signaling
|
||||||
snipe-it
|
usrsctp
|
||||||
;
|
;
|
||||||
} // prev.lib.optionalAttrs (prev.system == "x86_64-linux") {
|
} // prev.lib.optionalAttrs (prev.system == "x86_64-linux") {
|
||||||
inherit (localPkgs)
|
inherit (localPkgs)
|
||||||
chrysalis-bin
|
|
||||||
ryzenadj
|
ryzenadj
|
||||||
ryzen_smu
|
ryzen_smu
|
||||||
;
|
;
|
||||||
|
|
|
@ -1,18 +1,32 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gengetopt
|
{ stdenv, lib, fetchFromGitHub
|
||||||
, glib, libconfig, libnice, jansson, boringssl, zlib, srtp, libuv
|
, jansson
|
||||||
, libmicrohttpd, curl, libwebsockets, sofia_sip, libogg, libopus
|
, libconfig
|
||||||
, usrsctp, ffmpeg
|
, libnice
|
||||||
|
, openssl
|
||||||
|
, srtp
|
||||||
|
, usrsctp
|
||||||
|
, libmicrohttpd
|
||||||
|
, libwebsockets
|
||||||
|
, gnumake
|
||||||
|
#, cmake
|
||||||
|
, rabbitmq-c
|
||||||
|
#, paho-mqtt-c
|
||||||
|
, nanomsg
|
||||||
|
, curl
|
||||||
|
, sofia_sip
|
||||||
|
, libopus
|
||||||
|
, libogg
|
||||||
|
, lua
|
||||||
|
, glib
|
||||||
|
, zlib
|
||||||
|
, pkgconfig
|
||||||
|
, gengetopt
|
||||||
|
, autoconf
|
||||||
|
, automake
|
||||||
|
, libtool
|
||||||
|
, libuv
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
|
||||||
libwebsockets_janus = libwebsockets.overrideAttrs (_: {
|
|
||||||
configureFlags = [
|
|
||||||
"-DLWS_MAX_SMP=1"
|
|
||||||
"-DLWS_WITHOUT_EXTENSIONS=0"
|
|
||||||
];
|
|
||||||
});
|
|
||||||
in
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "janus-gateway";
|
pname = "janus-gateway";
|
||||||
version = "0.11.3";
|
version = "0.11.3";
|
||||||
|
@ -21,39 +35,47 @@ stdenv.mkDerivation rec {
|
||||||
owner = "meetecho";
|
owner = "meetecho";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "15nadpz67w24f4wz8ya0kx0a1jc4wxv1kl0d5fr7kckkdyijh7gz";
|
sha256 = "sha256-/x0oo29zsnmyKw3QGXbnhMmgQJ9AefQ5cUTwY/5typY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ autoreconfHook pkg-config gengetopt ];
|
nativeBuildInputs = [
|
||||||
|
jansson
|
||||||
|
libconfig
|
||||||
|
libnice
|
||||||
|
openssl
|
||||||
|
srtp
|
||||||
|
usrsctp
|
||||||
|
libmicrohttpd
|
||||||
|
libwebsockets
|
||||||
|
gnumake
|
||||||
|
#cmake
|
||||||
|
rabbitmq-c
|
||||||
|
#paho-mqtt-c
|
||||||
|
nanomsg
|
||||||
|
curl
|
||||||
|
sofia_sip
|
||||||
|
libopus
|
||||||
|
libogg
|
||||||
|
lua
|
||||||
|
glib
|
||||||
|
zlib
|
||||||
|
pkgconfig
|
||||||
|
gengetopt
|
||||||
|
libuv
|
||||||
|
|
||||||
buildInputs = [
|
autoconf
|
||||||
glib libconfig libnice jansson boringssl zlib srtp libuv libmicrohttpd
|
automake
|
||||||
curl libwebsockets_janus sofia_sip libogg libopus usrsctp ffmpeg
|
libtool
|
||||||
];
|
];
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
configureFlags = [
|
preConfigure = "./autogen.sh";
|
||||||
"--enable-boringssl=${boringssl}"
|
|
||||||
"--enable-libsrtp2"
|
|
||||||
"--enable-turn-rest-api"
|
|
||||||
"--enable-json-logger"
|
|
||||||
"--enable-gelf-event-handler"
|
|
||||||
"--enable-post-processing"
|
|
||||||
];
|
|
||||||
|
|
||||||
outputs = [ "out" "dev" "doc" "man" ];
|
|
||||||
|
|
||||||
postInstall = ''
|
|
||||||
moveToOutput share/janus "$doc"
|
|
||||||
moveToOutput etc "$doc"
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "General purpose WebRTC server";
|
description = "Janus WebRTC server";
|
||||||
homepage = "https://janus.conf.meetecho.com/";
|
homepage = src.meta.homepage;
|
||||||
license = licenses.gpl3Only;
|
license = licenses.gpl3;
|
||||||
platforms = platforms.linux;
|
maintainers = with maintainers; [ aw ];
|
||||||
maintainers = with maintainers; [ fpletz ];
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,21 +2,21 @@
|
||||||
|
|
||||||
buildGoPackage rec {
|
buildGoPackage rec {
|
||||||
pname = "nextcloud-spreed-signaling";
|
pname = "nextcloud-spreed-signaling";
|
||||||
version = "0.3.0";
|
version = "0.2.0";
|
||||||
|
|
||||||
goPackagePath = "github.com/strukturag/nextcloud-spreed-signaling";
|
goPackagePath = "github.com/strukturag/nextcloud-spreed-signaling";
|
||||||
|
|
||||||
subPackages = [
|
subPackages = [
|
||||||
"client"
|
"src/signaling"
|
||||||
"server"
|
"src/server"
|
||||||
"proxy"
|
"src/proxy"
|
||||||
];
|
];
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "strukturag";
|
owner = "strukturag";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-oKH9rpZa+CGnqgQD6Wa1KPi26ePrGZJzz9WXOauNs+U=";
|
sha256 = "sha256-heDi/kWyPDZ9oPjBhNRBAkiKkkEnXmfSanYvCUSB5Ls=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ easyjson ];
|
nativeBuildInputs = [ easyjson ];
|
||||||
|
@ -24,7 +24,8 @@ buildGoPackage rec {
|
||||||
goDeps = ./deps.nix;
|
goDeps = ./deps.nix;
|
||||||
|
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
easyjson -all go/src/github.com/strukturag/nextcloud-spreed-signaling/{api_signaling,api_backend,api_proxy,natsclient,room}.go
|
ln -s $PWD/go/src/${goPackagePath}/src/* go/src
|
||||||
|
easyjson -all go/src/signaling/{api_signaling,api_backend,api_proxy,natsclient,room}.go
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,28 @@
|
||||||
|
{ lib, stdenv, fetchFromGitHub, which, libtool, autoconf, automake }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "usrsctp";
|
||||||
|
version = "0.9.5.0";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "sctplab";
|
||||||
|
repo = pname;
|
||||||
|
rev = version;
|
||||||
|
sha256 = "sha256-Sengtkg4UoA03cPy5+dRSr5qKIttWHEKn48udOP8zYI=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [ which libtool autoconf automake ];
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
NIX_CFLAGS_COMPILE = "-O2";
|
||||||
|
|
||||||
|
preConfigure = "./bootstrap";
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "A userland SCTP stack supporting FreeBSD, Linux, Mac OS X and Windows";
|
||||||
|
homepage = src.meta.homepage;
|
||||||
|
maintainers = with maintainers; [ aw ];
|
||||||
|
license = licenses.bsd3;
|
||||||
|
};
|
||||||
|
}
|
Loading…
Reference in New Issue