Skip to content

Commit

Permalink
libwebsockets: re-init 3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
peterhoeg committed Sep 16, 2019
1 parent e19054a commit b02b889
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 23 deletions.
63 changes: 41 additions & 22 deletions pkgs/development/libraries/libwebsockets/default.nix
@@ -1,28 +1,47 @@
{ fetchFromGitHub, stdenv, cmake, openssl, zlib, libuv }:

stdenv.mkDerivation rec {
pname = "libwebsockets";
version = "3.2.0";

src = fetchFromGitHub {
owner = "warmcat";
repo = "libwebsockets";
rev = "v${version}";
sha256 = "0ac5755h3w1pl6cznqbvg63dwkqy544fqlhvqyp7s11hgs7jx6l8";
let
generic = { version, sha256 }: stdenv.mkDerivation rec {
pname = "libwebsockets";
inherit version;

src = fetchFromGitHub {
owner = "warmcat";
repo = "libwebsockets";
rev = "v${version}";
inherit sha256;
};

buildInputs = [ openssl zlib libuv ];

nativeBuildInputs = [ cmake ];

cmakeFlags = [ "-DLWS_WITH_PLUGINS=ON" ];

meta = with stdenv.lib; {
description = "Light, portable C library for websockets";
longDescription = ''
Libwebsockets is a lightweight pure C library built to
use minimal CPU and memory resources, and provide fast
throughput in both directions.
'';
homepage = "https://libwebsockets.org/";
license = licenses.lgpl21;
platforms = platforms.all;
};
};

buildInputs = [ cmake openssl zlib libuv ];
cmakeFlags = [ "-DLWS_WITH_PLUGINS=ON" ];

meta = {
description = "Light, portable C library for websockets";
longDescription = ''
Libwebsockets is a lightweight pure C library built to
use minimal CPU and memory resources, and provide fast
throughput in both directions.
'';
homepage = https://github.com/warmcat/libwebsockets;
license = stdenv.lib.licenses.lgpl21;
platforms = stdenv.lib.platforms.all;
in
rec {
libwebsockets_3_1 = generic {
sha256 = "1w1wz6snf3cmcpa3f4dci2nz9za2f5rrylxl109id7bcb36xhbdl";
version = "3.1.0";
};

libwebsockets_3_2 = generic {
version = "3.2.0";
sha256 = "0ac5755h3w1pl6cznqbvg63dwkqy544fqlhvqyp7s11hgs7jx6l8";
};

libwebsockets = libwebsockets_3_2;
}
5 changes: 4 additions & 1 deletion pkgs/top-level/all-packages.nix
Expand Up @@ -4581,7 +4581,10 @@ in

librest = callPackage ../development/libraries/librest { };

libwebsockets = callPackage ../development/libraries/libwebsockets { };
inherit (callPackages ../development/libraries/libwebsockets { })
libwebsockets_3_1
libwebsockets_3_2
libwebsockets;

lidarr = callPackage ../servers/lidarr { };

Expand Down

0 comments on commit b02b889

Please sign in to comment.