Merge pull request #18643 from chris-martin/czmqpp

czmqpp: init at 1.2.0
This commit is contained in:
Daiderd Jordan 2016-09-17 19:26:34 +02:00 committed by GitHub
commit 3748990e59
3 changed files with 47 additions and 0 deletions

View File

@ -0,0 +1,28 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, czmq }:
stdenv.mkDerivation rec {
name = "czmqpp-${version}";
version = "1.2.0";
src = fetchFromGitHub {
owner = "zeromq";
repo = "czmqpp";
rev = "v${version}";
sha256 = "0z8lwq53yk4h7pgibicx3q9idz15qb95r0pjpz0j5vql6qh46rja";
};
meta = with stdenv.lib; {
inherit (src.meta) homepage;
description = "C++ wrapper for czmq. Aims to be minimal, simple and consistent";
license = licenses.lgpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ chris-martin ];
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
propagatedBuildInputs = [ czmq ];
# https://github.com/zeromq/czmqpp/issues/42
patches = [ ./socket.patch ];
}

View File

@ -0,0 +1,17 @@
--- /src/socket.cpp
+++ /src/socket.cpp
@@ -60,12 +60,12 @@
int socket::bind(const std::string& address)
{
// format-security: format not a string literal and no format arguments.
- return zsocket_bind(self_, address.c_str());
+ return zsocket_bind(self_, "%s", address.c_str());
}
int socket::connect(const std::string& address)
{
// format-security: format not a string literal and no format arguments.
- return zsocket_connect(self_, address.c_str());
+ return zsocket_connect(self_, "%s", address.c_str());
}
bool operator==(const socket& sock_a, const socket& sock_b)

View File

@ -9951,6 +9951,8 @@ in
czmq = callPackage ../development/libraries/czmq { };
czmqpp = callPackage ../development/libraries/czmqpp { };
zimlib = callPackage ../development/libraries/zimlib { };
zita-convolver = callPackage ../development/libraries/audio/zita-convolver { };