Skip to content

Commit

Permalink
libwebsockets: 4.3.0 -> 4.3.1
Browse files Browse the repository at this point in the history
Changelog (there's no official one):
- warmcat/libwebsockets@v4.3.0...v4.3.1

Also apply a patch required to make ttyd build again.
This is probably due to a bug in the lws cmake module,
which may only be exercised in this package.
See also tsl0922/ttyd#918.
  • Loading branch information
Mindavi committed Apr 24, 2022
1 parent b4729ba commit da80a59
Showing 1 changed file with 14 additions and 3 deletions.
17 changes: 14 additions & 3 deletions pkgs/development/libraries/libwebsockets/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@
, openssl
, zlib
, libuv
, fetchpatch
# External poll is required for e.g. mosquitto, but discouraged by the maintainer.
, withExternalPoll ? false
}:

let
generic = { version, sha256 }: stdenv.mkDerivation rec {
generic = { version, sha256, patches ? [] }: stdenv.mkDerivation rec {
pname = "libwebsockets";
inherit version;

Expand All @@ -21,6 +22,8 @@ let
inherit sha256;
};

inherit patches;

buildInputs = [ openssl zlib libuv ];

nativeBuildInputs = [ cmake ];
Expand Down Expand Up @@ -76,7 +79,15 @@ in {
};

libwebsockets_4_3 = generic {
version = "4.3.0";
sha256 = "13lxb487mqlzbsbv6fbj50r1717mfwdy87ps592lgfy3307yqpr4";
version = "4.3.1";
sha256 = "sha256-lB3JHh058cQc5rycLnHk3JAOgtku0nRCixN5U6lPKq8=";
patches = [
# fixes the propagated cmake files, fixing the build of ttyd
# see also https://github.com/tsl0922/ttyd/issues/918
(fetchpatch {
url = "https://github.com/warmcat/libwebsockets/commit/99a8b9c4422bed45c8b7412a1e121056f2a6132a.patch";
hash = "sha256-zHBo2ZEayvibM+jzeVaZqySxghaOLUglpSFwuGhl6HM=";
})
];
};
}

0 comments on commit da80a59

Please sign in to comment.