about summary refs log tree commit diff
path: root/pkgs/development/libraries
diff options
context:
space:
mode:
authorPeter Hoeg <peter@hoeg.com>2020-04-08 22:32:43 +0800
committerGitHub <noreply@github.com>2020-04-08 22:32:43 +0800
commit8cbe9f03f9d138e9422662112193c89c580d0c2e (patch)
treeeb9e3ff0e5b8ca315bfe82252edcac0b292f2364 /pkgs/development/libraries
parentb7243c79c878c38bc6c42508034c3074930a38bf (diff)
parent0f2d390a6ecaf7e74d8166a1d67fa29dd19b96ac (diff)
downloadnixlib-8cbe9f03f9d138e9422662112193c89c580d0c2e.tar
nixlib-8cbe9f03f9d138e9422662112193c89c580d0c2e.tar.gz
nixlib-8cbe9f03f9d138e9422662112193c89c580d0c2e.tar.bz2
nixlib-8cbe9f03f9d138e9422662112193c89c580d0c2e.tar.lz
nixlib-8cbe9f03f9d138e9422662112193c89c580d0c2e.tar.xz
nixlib-8cbe9f03f9d138e9422662112193c89c580d0c2e.tar.zst
nixlib-8cbe9f03f9d138e9422662112193c89c580d0c2e.zip
Merge pull request #81780 from volth/patch-387
libwebsockets: 3.2.0 -> 3.2.2; init as 4.0.0
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r--pkgs/development/libraries/libwebsockets/default.nix10
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix
index 732a529c21f4..ddafc9bc6594 100644
--- a/pkgs/development/libraries/libwebsockets/default.nix
+++ b/pkgs/development/libraries/libwebsockets/default.nix
@@ -17,6 +17,7 @@ let
     nativeBuildInputs = [ cmake ];
 
     cmakeFlags = [ "-DLWS_WITH_PLUGINS=ON" ];
+    NIX_CFLAGS_COMPILE = "-Wno-error=unused-but-set-variable";
 
     meta = with stdenv.lib; {
       description = "Light, portable C library for websockets";
@@ -39,9 +40,12 @@ rec {
   };
 
   libwebsockets_3_2 = generic {
-    version = "3.2.0";
-    sha256 = "0ac5755h3w1pl6cznqbvg63dwkqy544fqlhvqyp7s11hgs7jx6l8";
+    version = "3.2.2";
+    sha256 = "0m1kn4p167jv63zvwhsvmdn8azx3q7fkk8qc0fclwyps2scz6dna";
   };
 
-  libwebsockets = libwebsockets_3_2;
+  libwebsockets_4_0 = generic {
+    version = "4.0.1";
+    sha256 = "1pf7km0w5q7dqlwcwqizdpfqgg10prfq8g2c093f5nghwsfv8mmf";
+  };
 }