From 8ad6b875abc1bbd04c1598b8d2f5ebd7053068b6 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 6 Apr 2015 14:43:33 -0700
Subject: [PATCH] ortp: 0.22.0 -> 0.24.1
---
pkgs/development/libraries/ortp/default.nix | 14 ++++++--------
pkgs/top-level/all-packages.nix | 4 +---
2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix
index ff7536de4034..561d0df4e805 100644
--- a/pkgs/development/libraries/ortp/default.nix
+++ b/pkgs/development/libraries/ortp/default.nix
@@ -1,19 +1,17 @@
-{stdenv, fetchurl, srtp, libzrtpcpp, pkgconfig }:
+{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "ortp-0.22.0";
+ name = "ortp-0.24.1";
src = fetchurl {
url = "mirror://savannah/linphone/ortp/sources/${name}.tar.gz";
- sha256 = "02rdm6ymgblbx8fnjfvivkl4qkgbdizrf35fyb0vln9m7jdy4dvf";
+ sha256 = "1mach7cdq4kydqkll8ra1kir818da07z253rf9pihifipqhcxv6i";
};
- configureFlags = "--enable-zrtp";
-
- propagatedBuildInputs = [ srtp libzrtpcpp pkgconfig ];
-
- meta = {
+ meta = with stdenv.lib; {
description = "A Real-Time Transport Protocol (RFC3550) stack";
homepage = http://www.linphone.org/index.php/eng/code_review/ortp;
+ license = licenses.lgpl21;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4b910aa59733..4a3ba1876800 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7191,9 +7191,7 @@ let
};
};
- ortp = callPackage ../development/libraries/ortp {
- srtp = srtp_linphone;
- };
+ ortp = callPackage ../development/libraries/ortp { };
p11_kit = callPackage ../development/libraries/p11-kit { };