From 4916f64948ae0c8fc7a1e0187c6305f90ffa88e0 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Tue, 19 Sep 2017 13:38:39 +0000
Subject: libwebsockets: 1.4 -> 2.3.0

---
 pkgs/development/libraries/libwebsockets/default.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'pkgs/development/libraries/libwebsockets/default.nix')

diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix
index 6ce18388904..dbcbf550c13 100644
--- a/pkgs/development/libraries/libwebsockets/default.nix
+++ b/pkgs/development/libraries/libwebsockets/default.nix
@@ -1,15 +1,19 @@
-{ fetchgit, stdenv, cmake, openssl, zlib }:
+{ fetchFromGitHub, stdenv, cmake, openssl, zlib, libuv }:
 
 stdenv.mkDerivation rec {
-  name = "libwebsockets-1.4";
+  name = "libwebsockets-${version}";
+  version = "2.3.0";
 
-  src = fetchgit {
-    url = "git://git.libwebsockets.org/libwebsockets";
-    rev = "16fb0132cec0fcced29bce6d86eaf94a9beb9785";
-    sha256 = "0gk4dgx125nz7wl59bx0kgxxg261r9kyxvdff5ld98slr9f08d0l";
+  src = fetchFromGitHub {
+    owner = "warmcat";
+    repo = "libwebsockets";
+    rev = "v${version}";
+    sha256 = "1hv2b5r6sg42xnqhm4ysjvyiz3cqpfmwaqm33vpbx0k7arj4ixvy";
   };
 
   buildInputs = [ cmake openssl zlib ];
+  propagatedBuildInputs = [ libuv ];
+  cmakeFlags = [ "-DLWS_WITH_PLUGINS=ON" ];
 
   meta = {
     description = "Light, portable C library for websockets";
@@ -19,8 +23,7 @@ stdenv.mkDerivation rec {
       throughput in both directions.
     '';
     homepage = https://libwebsockets.org/trac/libwebsockets;
-    # See http://git.libwebsockets.org/cgi-bin/cgit/libwebsockets/tree/LICENSE
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = stdenv.lib.licenses.lgpl;
     maintainers = [ ];
     platforms = stdenv.lib.platforms.all;
   };
-- 
cgit 1.4.1