cppzmq: make zeromq propagatedBuildInput
cppzmq is a header-only library. As such, it is not much useful without zeromq, whose headers it includes. By having zeromq in propagatedBuildInputs, we can simplify dependent expressions. This change is motivated by https://github.com/lopsided98/nix-ros-overlay/issues/255#issuecomment-1487590226. The expressions in nix-ros-overlay are automatically generated and since packages in other distributions where ROS runs need not to explicitly depend on zeromq, the Nix expression should behave the same. This way, nix-ros-overlay will not to have manually patch/overlay the automatically generated expressions.
This commit is contained in:
parent
9a6aabc474
commit
b1cb42d3b7
@ -1,6 +1,6 @@
|
|||||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, git, doxygen, graphviz
|
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, git, doxygen, graphviz
|
||||||
, boost, miniupnpc, openssl, unbound, cppzmq
|
, boost, miniupnpc, openssl, unbound, cppzmq
|
||||||
, zeromq, pcsclite, readline, libsodium
|
, pcsclite, readline, libsodium
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
@ -22,7 +22,7 @@ stdenv.mkDerivation {
|
|||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
boost miniupnpc openssl unbound
|
boost miniupnpc openssl unbound
|
||||||
cppzmq zeromq pcsclite readline libsodium
|
cppzmq pcsclite readline libsodium
|
||||||
];
|
];
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, unbound, openssl, boost
|
{ 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 {
|
stdenv.mkDerivation rec {
|
||||||
pname = "masari";
|
pname = "masari";
|
||||||
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
boost miniupnpc openssl unbound
|
boost miniupnpc openssl unbound
|
||||||
zeromq readline libsodium
|
readline libsodium
|
||||||
rapidjson cppzmq
|
rapidjson cppzmq
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -25,7 +25,6 @@
|
|||||||
, SDL
|
, SDL
|
||||||
, gsl
|
, gsl
|
||||||
, cppzmq
|
, cppzmq
|
||||||
, zeromq
|
|
||||||
# Needed only if qt-gui is disabled, from some reason
|
# Needed only if qt-gui is disabled, from some reason
|
||||||
, icu
|
, icu
|
||||||
# GUI related
|
# GUI related
|
||||||
@ -203,7 +202,7 @@ let
|
|||||||
runtime = [ gsl ];
|
runtime = [ gsl ];
|
||||||
};
|
};
|
||||||
gr-zeromq = {
|
gr-zeromq = {
|
||||||
runtime = [ cppzmq zeromq ];
|
runtime = [ cppzmq ];
|
||||||
cmakeEnableFlag = "GR_ZEROMQ";
|
cmakeEnableFlag = "GR_ZEROMQ";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -28,7 +28,6 @@
|
|||||||
, libunwind
|
, libunwind
|
||||||
, thrift
|
, thrift
|
||||||
, cppzmq
|
, cppzmq
|
||||||
, zeromq
|
|
||||||
# Needed only if qt-gui is disabled, from some reason
|
# Needed only if qt-gui is disabled, from some reason
|
||||||
, icu
|
, icu
|
||||||
# GUI related
|
# GUI related
|
||||||
@ -228,7 +227,7 @@ let
|
|||||||
runtime = [ gsl libsodium ];
|
runtime = [ gsl libsodium ];
|
||||||
};
|
};
|
||||||
gr-zeromq = {
|
gr-zeromq = {
|
||||||
runtime = [ cppzmq zeromq ];
|
runtime = [ cppzmq ];
|
||||||
cmakeEnableFlag = "GR_ZEROMQ";
|
cmakeEnableFlag = "GR_ZEROMQ";
|
||||||
};
|
};
|
||||||
gr-network = {
|
gr-network = {
|
||||||
|
@ -30,7 +30,6 @@
|
|||||||
, libunwind
|
, libunwind
|
||||||
, thrift
|
, thrift
|
||||||
, cppzmq
|
, cppzmq
|
||||||
, zeromq
|
|
||||||
# Needed only if qt-gui is disabled, from some reason
|
# Needed only if qt-gui is disabled, from some reason
|
||||||
, icu
|
, icu
|
||||||
# GUI related
|
# GUI related
|
||||||
@ -247,7 +246,7 @@ let
|
|||||||
runtime = [ gsl libsodium ];
|
runtime = [ gsl libsodium ];
|
||||||
};
|
};
|
||||||
gr-zeromq = {
|
gr-zeromq = {
|
||||||
runtime = [ cppzmq zeromq ];
|
runtime = [ cppzmq ];
|
||||||
cmakeEnableFlag = "GR_ZEROMQ";
|
cmakeEnableFlag = "GR_ZEROMQ";
|
||||||
};
|
};
|
||||||
gr-network = {
|
gr-network = {
|
||||||
|
@ -19,7 +19,6 @@
|
|||||||
, speex
|
, speex
|
||||||
, speexdsp
|
, speexdsp
|
||||||
, cppzmq
|
, cppzmq
|
||||||
, zeromq
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
gnuradio3_8.pkgs.mkDerivation rec {
|
gnuradio3_8.pkgs.mkDerivation rec {
|
||||||
@ -67,7 +66,6 @@ gnuradio3_8.pkgs.mkDerivation rec {
|
|||||||
libftdi
|
libftdi
|
||||||
libsndfile
|
libsndfile
|
||||||
cppzmq
|
cppzmq
|
||||||
zeromq
|
|
||||||
gnuradio3_8.qwt
|
gnuradio3_8.qwt
|
||||||
] ++ lib.optionals (gnuradio3_8.hasFeature "gr-ctrlport") [
|
] ++ lib.optionals (gnuradio3_8.hasFeature "gr-ctrlport") [
|
||||||
thrift
|
thrift
|
||||||
|
@ -19,7 +19,6 @@
|
|||||||
, python3
|
, python3
|
||||||
, sqlite
|
, sqlite
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook
|
||||||
, zeromq
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
@ -48,7 +47,6 @@ stdenv.mkDerivation rec {
|
|||||||
podofo
|
podofo
|
||||||
python3
|
python3
|
||||||
sqlite
|
sqlite
|
||||||
zeromq
|
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
buildInputs = [ zeromq ];
|
propagatedBuildInputs = [ zeromq ];
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
# Tests try to download googletest at compile time; there is no option
|
# Tests try to download googletest at compile time; there is no option
|
||||||
|
Loading…
Reference in New Issue
Block a user