Merge pull request #224099 from wentasah/cppzmq-propagate

cppzmq: make zeromq propagatedBuildInput

Changed files
+8 -15
pkgs
applications
blockchains
aeon
masari
radio
gnuradio
qradiolink
science
electronics
horizon-eda
development
libraries
cppzmq
+2 -2
pkgs/applications/blockchains/aeon/default.nix
···
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, git, doxygen, graphviz
, boost, miniupnpc, openssl, unbound, cppzmq
-
, zeromq, pcsclite, readline, libsodium
+
, pcsclite, readline, libsodium
}:
let
···
buildInputs = [
boost miniupnpc openssl unbound
-
cppzmq zeromq pcsclite readline libsodium
+
cppzmq pcsclite readline libsodium
];
cmakeFlags = [
+2 -2
pkgs/applications/blockchains/masari/default.nix
···
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, unbound, openssl, boost
-
, lmdb, miniupnpc, readline, git, zeromq, libsodium, rapidjson, cppzmq }:
+
, lmdb, miniupnpc, readline, git, libsodium, rapidjson, cppzmq }:
stdenv.mkDerivation rec {
pname = "masari";
···
buildInputs = [
boost miniupnpc openssl unbound
-
zeromq readline libsodium
+
readline libsodium
rapidjson cppzmq
];
+1 -2
pkgs/applications/radio/gnuradio/3.8.nix
···
, SDL
, gsl
, cppzmq
-
, zeromq
# Needed only if qt-gui is disabled, from some reason
, icu
# GUI related
···
runtime = [ gsl ];
};
gr-zeromq = {
-
runtime = [ cppzmq zeromq ];
+
runtime = [ cppzmq ];
cmakeEnableFlag = "GR_ZEROMQ";
};
};
+1 -2
pkgs/applications/radio/gnuradio/3.9.nix
···
, libunwind
, thrift
, cppzmq
-
, zeromq
# Needed only if qt-gui is disabled, from some reason
, icu
# GUI related
···
runtime = [ gsl libsodium ];
};
gr-zeromq = {
-
runtime = [ cppzmq zeromq ];
+
runtime = [ cppzmq ];
cmakeEnableFlag = "GR_ZEROMQ";
};
gr-network = {
+1 -2
pkgs/applications/radio/gnuradio/default.nix
···
, libunwind
, thrift
, cppzmq
-
, zeromq
# Needed only if qt-gui is disabled, from some reason
, icu
# GUI related
···
runtime = [ gsl libsodium ];
};
gr-zeromq = {
-
runtime = [ cppzmq zeromq ];
+
runtime = [ cppzmq ];
cmakeEnableFlag = "GR_ZEROMQ";
};
gr-network = {
-2
pkgs/applications/radio/qradiolink/default.nix
···
, speex
, speexdsp
, cppzmq
-
, zeromq
}:
gnuradio3_8.pkgs.mkDerivation rec {
···
libftdi
libsndfile
cppzmq
-
zeromq
gnuradio3_8.qwt
] ++ lib.optionals (gnuradio3_8.hasFeature "gr-ctrlport") [
thrift
-2
pkgs/applications/science/electronics/horizon-eda/default.nix
···
, python3
, sqlite
, wrapGAppsHook
-
, zeromq
}:
stdenv.mkDerivation rec {
···
podofo
python3
sqlite
-
zeromq
];
nativeBuildInputs = [
+1 -1
pkgs/development/libraries/cppzmq/default.nix
···
};
nativeBuildInputs = [ cmake ];
-
buildInputs = [ zeromq ];
+
propagatedBuildInputs = [ zeromq ];
cmakeFlags = [
# Tests try to download googletest at compile time; there is no option