From c1de354a3db238ddd1c125a77fd931566b2dda47 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Wed, 20 Sep 2017 02:48:25 +0100 Subject: libwebsockets: revert making libuv a propagated build input it is possible to use libwebsockets without libuv cc @volth --- pkgs/development/libraries/libwebsockets/default.nix | 3 +-- pkgs/servers/mqtt/mosquitto/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix index 0953a915a2c..98f3ea1679c 100644 --- a/pkgs/development/libraries/libwebsockets/default.nix +++ b/pkgs/development/libraries/libwebsockets/default.nix @@ -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 = { diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index 782581b860a..b0e05aa8bc0 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/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"; @@ -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 = [ -- cgit 1.4.1