1
0
Fork 0

Compare commits

..

No commits in common. "454dc9ae45e8377496dce3b3c970fc44831dc9de" and "b97a46705dfa1a22751b4bafa3547acdf48c237c" have entirely different histories.

4 changed files with 30 additions and 34 deletions

View File

@ -10,9 +10,16 @@ with self; rec {
janus-gateway = callPackage ./pkgs/janus-gateway { }; janus-gateway = callPackage ./pkgs/janus-gateway { };
linuxPackages_latest = linuxPackages_5_9;
nextcloud-spreed-signaling = callPackage ./pkgs/nextcloud-spreed-signaling { }; nextcloud-spreed-signaling = callPackage ./pkgs/nextcloud-spreed-signaling { };
usrsctp = callPackage ./pkgs/usrsctp { }; linux_5_9 = callPackage ./pkgs/linux/linux-5.9.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.export_kernel_fpu_functions."5.3"
];
};
linuxPackages_5_9 = recurseIntoAttrs (linuxPackagesFor linux_5_9);
linuxPackages_latest = linuxPackages_5_9;
} }

View File

@ -4,7 +4,7 @@
, libnice , libnice
, openssl , openssl
, srtp , srtp
, usrsctp #, usrsctp
, libmicrohttpd , libmicrohttpd
, libwebsockets , libwebsockets
, gnumake , gnumake
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
libnice libnice
openssl openssl
srtp srtp
usrsctp #usrsctp
libmicrohttpd libmicrohttpd
libwebsockets libwebsockets
gnumake gnumake

18
pkgs/linux/linux-5.9.nix Normal file
View File

@ -0,0 +1,18 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
with stdenv.lib;
buildLinux (args // rec {
version = "5.9.6";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
# branchVersion needs to be x.y
extraMeta.branch = versions.majorMinor version;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0w2kcng09nzk09dwkx4azdfgnwzbd2mz8lyl4j69bwx837z85hbc";
};
} // (args.argsOverride or {}))

View File

@ -1,29 +0,0 @@
{ stdenv, lib, fetchFromGitHub, which, libtool, autoconf, automake }:
let
version = "2020-11-04";
rev = "4098a99f47eb7145f6f7ce0b66a19f6b1b13ebfa";
sha256 = "1mfaz4ya5c2k1cpn5id4312qb9ni5sp9j7c57jxcfjx7bkds6k17";
in stdenv.mkDerivation rec {
pname = "usrsctp-unstable";
inherit version;
src = fetchFromGitHub {
owner = "sctplab";
repo = "usrsctp";
inherit rev sha256;
};
nativeBuildInputs = [
which
libtool
autoconf
automake
];
hardeningDisable = [
"fortify"
];
preConfigure = "./bootstrap";
}