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

libwebsockets: revert making libuv a propagated build input

Browse Source 
it is possible to use libwebsockets without libuv

cc @volth
This commit is contained in:
Jörg Thalheim 2017-09-20 02:48:25 +01:00
parent 87435a95f8
commit c1de354a3d
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1hv2b5r6sg42xnqhm4ysjvyiz3cqpfmwaqm33vpbx0k7arj4ixvy"; sha256 = "1hv2b5r6sg42xnqhm4ysjvyiz3cqpfmwaqm33vpbx0k7arj4ixvy";
}; };
buildInputs = [ cmake openssl zlib ]; buildInputs = [ cmake openssl zlib libuv ];
propagatedBuildInputs = [ libuv ];
cmakeFlags = [ "-DLWS_WITH_PLUGINS=ON" ]; cmakeFlags = [ "-DLWS_WITH_PLUGINS=ON" ];
meta = { meta = {

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, openssl, libuuid, cmake, libwebsockets, c-ares }: { stdenv, fetchurl, openssl, libuuid, cmake, libwebsockets, c-ares, libuv }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mosquitto"; pname = "mosquitto";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1la2577h7hcyj7lq26vizj0sh2zmi9m7nbxjp3aalayi66kiysqm"; sha256 = "1la2577h7hcyj7lq26vizj0sh2zmi9m7nbxjp3aalayi66kiysqm";
}; };
buildInputs = [ openssl libuuid libwebsockets c-ares ] buildInputs = [ openssl libuuid libwebsockets c-ares libuv ]
++ stdenv.lib.optional stdenv.isDarwin cmake; ++ stdenv.lib.optional stdenv.isDarwin cmake;
makeFlags = [ makeFlags = [