Skip to content

Commit c1de354

Browse files
Mic92Mic92
committedSep 20, 2017
libwebsockets: revert making libuv a propagated build input
it is possible to use libwebsockets without libuv cc @volth
·
branch-off-24.1118.03-beta
1 parent 87435a9 commit c1de354

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed
 

‎pkgs/development/libraries/libwebsockets/default.nix

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
1111
sha256 = "1hv2b5r6sg42xnqhm4ysjvyiz3cqpfmwaqm33vpbx0k7arj4ixvy";
1212
};
1313

14-
buildInputs = [ cmake openssl zlib ];
15-
propagatedBuildInputs = [ libuv ];
14+
buildInputs = [ cmake openssl zlib libuv ];
1615
cmakeFlags = [ "-DLWS_WITH_PLUGINS=ON" ];
1716

1817
meta = {

‎pkgs/servers/mqtt/mosquitto/default.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ stdenv, fetchurl, openssl, libuuid, cmake, libwebsockets, c-ares }:
1+
{ stdenv, fetchurl, openssl, libuuid, cmake, libwebsockets, c-ares, libuv }:
22

33
stdenv.mkDerivation rec {
44
pname = "mosquitto";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111
sha256 = "1la2577h7hcyj7lq26vizj0sh2zmi9m7nbxjp3aalayi66kiysqm";
1212
};
1313

14-
buildInputs = [ openssl libuuid libwebsockets c-ares ]
14+
buildInputs = [ openssl libuuid libwebsockets c-ares libuv ]
1515
++ stdenv.lib.optional stdenv.isDarwin cmake;
1616

1717
makeFlags = [

1 commit comments

Comments
 (1)

jirkadanek commented on Oct 4, 2017

@jirkadanek
jirkadanek
on Oct 4, 2017
Member

How? I just saw this compilation error in my program that is using libwebsockets

FAILED: src/CMakeFiles/qpid-dispatch.dir/http-libwebsockets.c.o 
/nix/store/jlj2xx4xii1hmgjsbnhf41hj49243la9-gcc-wrapper-7.2.0/bin/gcc -Dqpid_dispatch_EXPORTS -I../include -Iinclude -I/home/jdanek/Work/repos/qpid-proton/install_asan/include -I/nix/store/1snk2wkpv97an87pk1842fgskl1vqhkr-python-2.7.14/include/python2.7 -I../src -Isrc -I/nix/store/0k63n3gh1d2d0six8imkd2vaamzi9pq2-libwebsockets-2.3.0/include -fsanitize=address -fsanitize=leak -fsanitize=undefined -O3 -DNDEBUG -fPIC   -g -fno-omit-frame-pointer -Werror -Wall -Wpedantic -std=gnu99 -pthread -MD -MT src/CMakeFiles/qpid-dispatch.dir/http-libwebsockets.c.o -MF src/CMakeFiles/qpid-dispatch.dir/http-libwebsockets.c.o.d -o src/CMakeFiles/qpid-dispatch.dir/http-libwebsockets.c.o   -c ../src/http-libwebsockets.c
In file included from ../src/http-libwebsockets.c:27:0:
/nix/store/0k63n3gh1d2d0six8imkd2vaamzi9pq2-libwebsockets-2.3.0/include/libwebsockets.h:173:10: fatal error: uv.h: No such file or directory
 #include <uv.h>
          ^~~~~~
compilation terminated.
Please sign in to comment.