diff options
| author | Michal Sojka <michal.sojka@cvut.cz> | 2023-03-31 18:14:09 +0200 |
|---|---|---|
| committer | Michal Sojka <michal.sojka@cvut.cz> | 2023-03-31 18:58:56 +0200 |
| commit | b1cb42d3b72a6f83e21727665d2a5eea1b0f2f80 (patch) | |
| tree | 9ce41712f566d80890fcd0faa93f5e72de038d12 /pkgs/applications/radio/gnuradio | |
| parent | 9a6aabc4740790ef3bbb246b86d029ccf6759658 (diff) | |
| download | nixpkgs-b1cb42d3b72a6f83e21727665d2a5eea1b0f2f80.tar nixpkgs-b1cb42d3b72a6f83e21727665d2a5eea1b0f2f80.tar.gz nixpkgs-b1cb42d3b72a6f83e21727665d2a5eea1b0f2f80.tar.bz2 nixpkgs-b1cb42d3b72a6f83e21727665d2a5eea1b0f2f80.tar.lz nixpkgs-b1cb42d3b72a6f83e21727665d2a5eea1b0f2f80.tar.xz nixpkgs-b1cb42d3b72a6f83e21727665d2a5eea1b0f2f80.tar.zst nixpkgs-b1cb42d3b72a6f83e21727665d2a5eea1b0f2f80.zip | |
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.
Diffstat (limited to 'pkgs/applications/radio/gnuradio')
| -rw-r--r-- | pkgs/applications/radio/gnuradio/3.8.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/radio/gnuradio/3.9.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/radio/gnuradio/default.nix | 3 |
3 files changed, 3 insertions, 6 deletions
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 = { |