Skip to content

Commit

Permalink
libwebsockets: revert making libuv a propagated build input
Browse files Browse the repository at this point in the history
it is possible to use libwebsockets without libuv

cc @volth
  • Loading branch information
Mic92 committed Sep 20, 2017
1 parent 87435a9 commit c1de354
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions pkgs/development/libraries/libwebsockets/default.nix
Expand Up @@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1hv2b5r6sg42xnqhm4ysjvyiz3cqpfmwaqm33vpbx0k7arj4ixvy";
};

buildInputs = [ cmake openssl zlib ];
propagatedBuildInputs = [ libuv ];
buildInputs = [ cmake openssl zlib libuv ];
cmakeFlags = [ "-DLWS_WITH_PLUGINS=ON" ];

meta = {
Expand Down
4 changes: 2 additions & 2 deletions pkgs/servers/mqtt/mosquitto/default.nix
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, openssl, libuuid, cmake, libwebsockets, c-ares }:
{ stdenv, fetchurl, openssl, libuuid, cmake, libwebsockets, c-ares, libuv }:

stdenv.mkDerivation rec {
pname = "mosquitto";
Expand All @@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1la2577h7hcyj7lq26vizj0sh2zmi9m7nbxjp3aalayi66kiysqm";
};

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

makeFlags = [
Expand Down

1 comment on commit c1de354

@jirkadanek
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.