Compare commits
3 Commits
b97a46705d
...
454dc9ae45
Author | SHA1 | Date |
---|---|---|
Andreas Wiese | 454dc9ae45 | |
Andreas Wiese | b652481e19 | |
Andreas Wiese | f68320d7cd |
13
default.nix
13
default.nix
|
@ -10,16 +10,9 @@ with self; rec {
|
|||
|
||||
janus-gateway = callPackage ./pkgs/janus-gateway { };
|
||||
|
||||
nextcloud-spreed-signaling = callPackage ./pkgs/nextcloud-spreed-signaling { };
|
||||
|
||||
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;
|
||||
|
||||
nextcloud-spreed-signaling = callPackage ./pkgs/nextcloud-spreed-signaling { };
|
||||
|
||||
usrsctp = callPackage ./pkgs/usrsctp { };
|
||||
}
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
, libnice
|
||||
, openssl
|
||||
, srtp
|
||||
#, usrsctp
|
||||
, usrsctp
|
||||
, libmicrohttpd
|
||||
, libwebsockets
|
||||
, gnumake
|
||||
|
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
|
|||
libnice
|
||||
openssl
|
||||
srtp
|
||||
#usrsctp
|
||||
usrsctp
|
||||
libmicrohttpd
|
||||
libwebsockets
|
||||
gnumake
|
||||
|
|
|
@ -1,18 +0,0 @@
|
|||
{ 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 {}))
|
|
@ -0,0 +1,29 @@
|
|||
{ 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";
|
||||
}
|
Loading…
Reference in New Issue