diff options
| -rw-r--r-- | pkgs/development/libraries/libwebsockets/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix index 732a529c21f4..3edde8434f02 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.0"; + sha256 = "1kba64whi5lrl2y83mnqp2cqry5j28fkzlqy9x2ki6zmryh2574j"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3b864a2b57f0..5a91b15152d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4885,7 +4885,8 @@ in inherit (callPackages ../development/libraries/libwebsockets { }) libwebsockets_3_1 libwebsockets_3_2 - libwebsockets; + libwebsockets_4_0; + libwebsockets = libwebsockets_3_2; lidarr = callPackage ../servers/lidarr { }; @@ -23303,7 +23304,7 @@ in multimc = libsForQt5.callPackage ../games/multimc { }; inherit (callPackages ../games/minetest { - inherit (darwin) libiconv; + inherit (darwin) libiconv; inherit (darwin.apple_sdk.frameworks) OpenGL OpenAL Carbon Cocoa; }) minetestclient_4 minetestserver_4 |