diff options
| author | Peter Simons <simons@cryp.to> | 2012-07-07 11:44:28 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2012-07-07 11:44:28 +0200 |
| commit | fda57fdd5eef9c87374b9737f74f3e07d1524fa5 (patch) | |
| tree | 9f64959fe056a0aa5ae1062914e6f701b7fe762b /pkgs/development/libraries/ccrtp | |
| parent | 08b29c6f96ce360f5a79e1243174593172e4a9d3 (diff) | |
| download | nixlib-fda57fdd5eef9c87374b9737f74f3e07d1524fa5.tar nixlib-fda57fdd5eef9c87374b9737f74f3e07d1524fa5.tar.gz nixlib-fda57fdd5eef9c87374b9737f74f3e07d1524fa5.tar.bz2 nixlib-fda57fdd5eef9c87374b9737f74f3e07d1524fa5.tar.lz nixlib-fda57fdd5eef9c87374b9737f74f3e07d1524fa5.tar.xz nixlib-fda57fdd5eef9c87374b9737f74f3e07d1524fa5.tar.zst nixlib-fda57fdd5eef9c87374b9737f74f3e07d1524fa5.zip | |
ccrtp-1.8: fix build with gcc 4.6
Diffstat (limited to 'pkgs/development/libraries/ccrtp')
| -rw-r--r-- | pkgs/development/libraries/ccrtp/1.8.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/ccrtp/gcc-4.6-fix.patch | 20 |
2 files changed, 23 insertions, 1 deletions
diff --git a/pkgs/development/libraries/ccrtp/1.8.nix b/pkgs/development/libraries/ccrtp/1.8.nix index 26e7050a60df..78bf7a678ac7 100644 --- a/pkgs/development/libraries/ccrtp/1.8.nix +++ b/pkgs/development/libraries/ccrtp/1.8.nix @@ -10,7 +10,9 @@ stdenv.mkDerivation { buildInputs = [ openssl pkgconfig libgcrypt commoncpp2 ]; - meta = { + patches = [ ./gcc-4.6-fix.patch ]; + + meta = { description = "GNU ccRTP is an implementation of RTP, the real-time transport protocol from the IETF"; homepage = "http://www.gnu.org/software/ccrtp/"; license = "GPLv2"; diff --git a/pkgs/development/libraries/ccrtp/gcc-4.6-fix.patch b/pkgs/development/libraries/ccrtp/gcc-4.6-fix.patch new file mode 100644 index 000000000000..49d07a89e52a --- /dev/null +++ b/pkgs/development/libraries/ccrtp/gcc-4.6-fix.patch @@ -0,0 +1,20 @@ +diff -ubr ccrtp-1.8.0-orig/src/ccrtp/sources.h ccrtp-1.8.0/src/ccrtp/sources.h +--- ccrtp-1.8.0-orig/src/ccrtp/sources.h 2010-04-18 20:51:49.000000000 +0200 ++++ ccrtp-1.8.0/src/ccrtp/sources.h 2012-07-07 11:42:50.961179016 +0200 +@@ -45,6 +45,7 @@ + #define CCXX_RTP_SOURCES_H_ + + #include <string> ++#include <cstddef> + #include <ccrtp/rtcppkt.h> + + #ifdef CCXX_NAMESPACES +@@ -406,7 +407,7 @@ + public: + typedef std::forward_iterator_tag iterator_category; + typedef Participant value_type; +- typedef ptrdiff_t difference_type; ++ typedef std::ptrdiff_t difference_type; + typedef const Participant* pointer; + typedef const Participant& reference; + |