diff --git a/default.nix b/default.nix index c319ab5..da125bd 100644 --- a/default.nix +++ b/default.nix @@ -6,14 +6,12 @@ let in rec { - janus-gateway = callPackage ./pkgs/janus-gateway { inherit usrsctp; }; + janus-gateway = callPackage ./pkgs/janus-gateway { }; nextcloud-spreed-signaling = callPackage ./pkgs/nextcloud-spreed-signaling { }; snipe-it = callPackage ./pkgs/snipe-it { }; - usrsctp = callPackage ./pkgs/usrsctp { }; - } // optionalAttrs (pkgs.system == "x86_64-linux") { chrysalis-bin = callPackage ./pkgs/chrysalis-bin { }; diff --git a/flake.nix b/flake.nix index 5e9ceee..a376b01 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "meterriblecrew.net package flake"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-20.09-small"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.05-small"; outputs = inputs@{ self, nixpkgs }: let @@ -33,7 +33,6 @@ inherit (localPkgs) janus-gateway nextcloud-spreed-signaling - usrsctp ; } // prev.lib.optionalAttrs (prev.system == "x86_64-linux") { inherit (localPkgs) diff --git a/pkgs/usrsctp/default.nix b/pkgs/usrsctp/default.nix deleted file mode 100644 index d1df318..0000000 --- a/pkgs/usrsctp/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ 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; - }; -}