JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #123917 from Mindavi/mosquitto/libwebsockets-4

Browse Source
This commit is contained in:
Sandro 2021-11-24 13:16:17 +01:00 committed by GitHub
commit 31c32857ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/libwebsockets/default.nix
View File

@ -5,6 +5,8 @@
, openssl
, zlib
, libuv
# External poll is required for e.g. mosquitto, but discouraged by the maintainer.
, withExternalPoll ? false
}:
let
@ -29,7 +31,8 @@ let
"-DLWS_WITH_SOCKS5=ON"
# Required since v4.2.0
"-DLWS_BUILD_HASH=no_hash"
] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DLWS_WITHOUT_TESTAPPS=ON";
] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DLWS_WITHOUT_TESTAPPS=ON"
++ lib.optional withExternalPoll "-DLWS_WITH_EXTERNAL_POLL=ON";
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=unused-but-set-variable";

10
pkgs/servers/mqtt/mosquitto/default.nix
View File

@ -8,13 +8,19 @@
, cjson
, libuuid
, libuv
, libwebsockets_3_1
, libwebsockets
, openssl
, withSystemd ? stdenv.isLinux
, systemd
, fetchpatch
}:
let
# Mosquitto needs external poll enabled in libwebsockets.
libwebsockets' = libwebsockets.override {
withExternalPoll = true;
};
in
stdenv.mkDerivation rec {
pname = "mosquitto";
version = "2.0.12";
@ -54,7 +60,7 @@ stdenv.mkDerivation rec {
cjson
libuuid
libuv
libwebsockets_3_1
libwebsockets'
openssl
] ++ lib.optional withSystemd systemd;