Unverified Commit 0c972f5f authored by Franz Pletz's avatar Franz Pletz Committed by GitHub
Browse files

Merge pull request #224099 from wentasah/cppzmq-propagate 

cppzmq: make zeromq propagatedBuildInput
parents dd3dfc46 b1cb42d3

pkgs/applications/blockchains/aeon/default.nix

+2 −2
Original line number Diff line number Diff line 
{ 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 = [

pkgs/applications/blockchains/masari/default.nix

+2 −2
Original line number Diff line number Diff line 
{ 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

  ];

pkgs/applications/radio/gnuradio/3.8.nix

+1 −2
Original line number Diff line number Diff line
@@ -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";

    };

  };

pkgs/applications/radio/gnuradio/3.9.nix

+1 −2
Original line number Diff line number Diff line
@@ -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 = {

pkgs/applications/radio/gnuradio/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -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 = {