pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #224099 from wentasah/cppzmq-propagate

cppzmq: make zeromq propagatedBuildInput

authored by

Franz Pletz and committed by
GitHub 0c972f5f dd3dfc46

+8 -15
unified split
+2 -2
pkgs/applications/blockchains/aeon/default.nix
··· 1 1 { lib, stdenv, fetchFromGitHub, cmake, pkg-config, git, doxygen, graphviz 2 2 , boost, miniupnpc, openssl, unbound, cppzmq 3 - , zeromq, pcsclite, readline, libsodium 3 + , pcsclite, readline, libsodium 4 4 }: 5 5 6 6 let ··· 22 22 23 23 buildInputs = [ 24 24 boost miniupnpc openssl unbound 25 - cppzmq zeromq pcsclite readline libsodium 25 + cppzmq pcsclite readline libsodium 26 26 ]; 27 27 28 28 cmakeFlags = [
+2 -2
pkgs/applications/blockchains/masari/default.nix
··· 1 1 { lib, stdenv, fetchFromGitHub, cmake, pkg-config, unbound, openssl, boost 2 - , lmdb, miniupnpc, readline, git, zeromq, libsodium, rapidjson, cppzmq }: 2 + , lmdb, miniupnpc, readline, git, libsodium, rapidjson, cppzmq }: 3 3 4 4 stdenv.mkDerivation rec { 5 5 pname = "masari"; ··· 21 21 22 22 buildInputs = [ 23 23 boost miniupnpc openssl unbound 24 - zeromq readline libsodium 24 + readline libsodium 25 25 rapidjson cppzmq 26 26 ]; 27 27
+1 -2
pkgs/applications/radio/gnuradio/3.8.nix
··· 25 25 , SDL 26 26 , gsl 27 27 , cppzmq 28 - , zeromq 29 28 # Needed only if qt-gui is disabled, from some reason 30 29 , icu 31 30 # GUI related ··· 203 202 runtime = [ gsl ]; 204 203 }; 205 204 gr-zeromq = { 206 - runtime = [ cppzmq zeromq ]; 205 + runtime = [ cppzmq ]; 207 206 cmakeEnableFlag = "GR_ZEROMQ"; 208 207 }; 209 208 };
+1 -2
pkgs/applications/radio/gnuradio/3.9.nix
··· 28 28 , libunwind 29 29 , thrift 30 30 , cppzmq 31 - , zeromq 32 31 # Needed only if qt-gui is disabled, from some reason 33 32 , icu 34 33 # GUI related ··· 228 227 runtime = [ gsl libsodium ]; 229 228 }; 230 229 gr-zeromq = { 231 - runtime = [ cppzmq zeromq ]; 230 + runtime = [ cppzmq ]; 232 231 cmakeEnableFlag = "GR_ZEROMQ"; 233 232 }; 234 233 gr-network = {
+1 -2
pkgs/applications/radio/gnuradio/default.nix
··· 30 30 , libunwind 31 31 , thrift 32 32 , cppzmq 33 - , zeromq 34 33 # Needed only if qt-gui is disabled, from some reason 35 34 , icu 36 35 # GUI related ··· 247 246 runtime = [ gsl libsodium ]; 248 247 }; 249 248 gr-zeromq = { 250 - runtime = [ cppzmq zeromq ]; 249 + runtime = [ cppzmq ]; 251 250 cmakeEnableFlag = "GR_ZEROMQ"; 252 251 }; 253 252 gr-network = {
-2
pkgs/applications/radio/qradiolink/default.nix
··· 19 19 , speex 20 20 , speexdsp 21 21 , cppzmq 22 - , zeromq 23 22 }: 24 23 25 24 gnuradio3_8.pkgs.mkDerivation rec { ··· 67 66 libftdi 68 67 libsndfile 69 68 cppzmq 70 - zeromq 71 69 gnuradio3_8.qwt 72 70 ] ++ lib.optionals (gnuradio3_8.hasFeature "gr-ctrlport") [ 73 71 thrift
-2
pkgs/applications/science/electronics/horizon-eda/default.nix
··· 19 19 , python3 20 20 , sqlite 21 21 , wrapGAppsHook 22 - , zeromq 23 22 }: 24 23 25 24 stdenv.mkDerivation rec { ··· 48 47 podofo 49 48 python3 50 49 sqlite 51 - zeromq 52 50 ]; 53 51 54 52 nativeBuildInputs = [
+1 -1
pkgs/development/libraries/cppzmq/default.nix
··· 12 12 }; 13 13 14 14 nativeBuildInputs = [ cmake ]; 15 - buildInputs = [ zeromq ]; 15 + propagatedBuildInputs = [ zeromq ]; 16 16 17 17 cmakeFlags = [ 18 18 # Tests try to download googletest at compile time; there is no option