diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-01-07 02:18:36 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-01-07 02:18:47 +0000 |
commit | 36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2 (patch) | |
tree | b3faaf573407b32aa645237a4d16b82778a39a92 /nixpkgs/pkgs/development/libraries/ccrtp | |
parent | 4e31070265257dc67d120c27e0f75c2344fdfa9a (diff) | |
parent | abf060725d7614bd3b9f96764262dfbc2f9c2199 (diff) | |
download | nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.gz nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.bz2 nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.lz nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.xz nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.zst nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.zip |
Add 'nixpkgs/' from commit 'abf060725d7614bd3b9f96764262dfbc2f9c2199'
git-subtree-dir: nixpkgs git-subtree-mainline: 4e31070265257dc67d120c27e0f75c2344fdfa9a git-subtree-split: abf060725d7614bd3b9f96764262dfbc2f9c2199
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/ccrtp')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/ccrtp/1.8.nix | 24 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/ccrtp/default.nix | 27 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/ccrtp/gcc-4.6-fix.patch | 20 |
3 files changed, 71 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/ccrtp/1.8.nix b/nixpkgs/pkgs/development/libraries/ccrtp/1.8.nix new file mode 100644 index 000000000000..db2d177b710c --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/ccrtp/1.8.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, openssl, pkgconfig, libgcrypt, commoncpp2 }: + +stdenv.mkDerivation { + name = "ccrtp-1.8.0"; + + src = fetchurl { + url = mirror://gnu/ccrtp/ccrtp-1.8.0.tar.gz; + sha256 = "0wr4dandlfajhmg90nqyvwv61ikn9vdycji001310y3c4zfysprn"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl libgcrypt commoncpp2 ]; + + patches = [ ./gcc-4.6-fix.patch ]; + + meta = { + description = "GNU ccRTP is an implementation of RTP, the real-time transport protocol from the IETF"; + homepage = https://www.gnu.org/software/ccrtp/; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.marcweber ]; + platforms = stdenv.lib.platforms.linux; + broken = true; # fails to compile with libgcrypt >= 1.6 + }; +} diff --git a/nixpkgs/pkgs/development/libraries/ccrtp/default.nix b/nixpkgs/pkgs/development/libraries/ccrtp/default.nix new file mode 100644 index 000000000000..cd9d031788a8 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/ccrtp/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pkgconfig, ucommon, openssl, libgcrypt }: + +stdenv.mkDerivation rec { + name = "ccrtp-2.1.2"; + + src = fetchurl { + url = "mirror://gnu/ccrtp/${name}.tar.gz"; + sha256 = "17ili8l7zqbbkzr1rcy4hlnazkf50mds41wg6n7bfdsx3c7cldgh"; + }; + + nativeBuildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ ucommon openssl libgcrypt ]; + + configureFlags = [ + "--disable-demos" + ]; + + doCheck = true; + + meta = { + description = "An implementation of the IETF real-time transport protocol (RTP)"; + homepage = https://www.gnu.org/software/ccrtp/; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ marcweber ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/ccrtp/gcc-4.6-fix.patch b/nixpkgs/pkgs/development/libraries/ccrtp/gcc-4.6-fix.patch new file mode 100644 index 000000000000..49d07a89e52a --- /dev/null +++ b/nixpkgs/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; + |