diff --git a/pkgs/applications/blockchains/aeon/default.nix b/pkgs/applications/blockchains/aeon/default.nix index 95dbd68a97c..13928c856b9 100644 --- a/pkgs/applications/blockchains/aeon/default.nix +++ b/pkgs/applications/blockchains/aeon/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, git, doxygen, graphviz , boost, miniupnpc, openssl, unbound, cppzmq -, zeromq, pcsclite, readline, libsodium +, pcsclite, readline, libsodium }: let @@ -22,7 +22,7 @@ stdenv.mkDerivation { buildInputs = [ boost miniupnpc openssl unbound - cppzmq zeromq pcsclite readline libsodium + cppzmq pcsclite readline libsodium ]; cmakeFlags = [ diff --git a/pkgs/applications/blockchains/masari/default.nix b/pkgs/applications/blockchains/masari/default.nix index 7cc0b2a593e..39735e6ddf0 100644 --- a/pkgs/applications/blockchains/masari/default.nix +++ b/pkgs/applications/blockchains/masari/default.nix @@ -1,5 +1,5 @@ { 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"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost miniupnpc openssl unbound - zeromq readline libsodium + readline libsodium rapidjson cppzmq ]; diff --git a/pkgs/applications/radio/gnuradio/3.8.nix b/pkgs/applications/radio/gnuradio/3.8.nix index 6220d36980c..1c53482143e 100644 --- a/pkgs/applications/radio/gnuradio/3.8.nix +++ b/pkgs/applications/radio/gnuradio/3.8.nix @@ -25,7 +25,6 @@ , SDL , gsl , cppzmq -, zeromq # Needed only if qt-gui is disabled, from some reason , icu # GUI related @@ -203,7 +202,7 @@ let runtime = [ gsl ]; }; gr-zeromq = { - runtime = [ cppzmq zeromq ]; + runtime = [ cppzmq ]; cmakeEnableFlag = "GR_ZEROMQ"; }; }; diff --git a/pkgs/applications/radio/gnuradio/3.9.nix b/pkgs/applications/radio/gnuradio/3.9.nix index 12b8ef003d9..170aa554e99 100644 --- a/pkgs/applications/radio/gnuradio/3.9.nix +++ b/pkgs/applications/radio/gnuradio/3.9.nix @@ -28,7 +28,6 @@ , libunwind , thrift , cppzmq -, zeromq # Needed only if qt-gui is disabled, from some reason , icu # GUI related @@ -228,7 +227,7 @@ let runtime = [ gsl libsodium ]; }; gr-zeromq = { - runtime = [ cppzmq zeromq ]; + runtime = [ cppzmq ]; cmakeEnableFlag = "GR_ZEROMQ"; }; gr-network = { diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index 80d534a351a..aa993b30220 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -30,7 +30,6 @@ , libunwind , thrift , cppzmq -, zeromq # Needed only if qt-gui is disabled, from some reason , icu # GUI related @@ -247,7 +246,7 @@ let runtime = [ gsl libsodium ]; }; gr-zeromq = { - runtime = [ cppzmq zeromq ]; + runtime = [ cppzmq ]; cmakeEnableFlag = "GR_ZEROMQ"; }; gr-network = { diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix index b5aaa390a7b..02542e50319 100644 --- a/pkgs/applications/radio/qradiolink/default.nix +++ b/pkgs/applications/radio/qradiolink/default.nix @@ -19,7 +19,6 @@ , speex , speexdsp , cppzmq -, zeromq }: gnuradio3_8.pkgs.mkDerivation rec { @@ -67,7 +66,6 @@ gnuradio3_8.pkgs.mkDerivation rec { libftdi libsndfile cppzmq - zeromq gnuradio3_8.qwt ] ++ lib.optionals (gnuradio3_8.hasFeature "gr-ctrlport") [ thrift diff --git a/pkgs/applications/science/electronics/horizon-eda/default.nix b/pkgs/applications/science/electronics/horizon-eda/default.nix index fa2f68b82ad..6cfa3017e39 100644 --- a/pkgs/applications/science/electronics/horizon-eda/default.nix +++ b/pkgs/applications/science/electronics/horizon-eda/default.nix @@ -19,7 +19,6 @@ , python3 , sqlite , wrapGAppsHook -, zeromq }: stdenv.mkDerivation rec { @@ -48,7 +47,6 @@ stdenv.mkDerivation rec { podofo python3 sqlite - zeromq ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix index 2555cf3b04d..332d9409ab1 100644 --- a/pkgs/development/libraries/cppzmq/default.nix +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ zeromq ]; + propagatedBuildInputs = [ zeromq ]; cmakeFlags = [ # Tests try to download googletest at compile time; there is no option