Commit b1cb42d3 authored by Michal Sojka's avatar Michal Sojka
Browse files

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.
parent 9a6aabc4

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 = {