srtp: Remove linphone and update 1.4.4 -> 1.5.2

pkgs/development/libraries/srtp/default.nix

@@ -1,51 +1,36 @@
-x@{builderDefsPackage
+{ stdenv, fetchFromGitHub, pkgconfig
-  , autoconf, automake, libtool, doxygen, procps
+, openssl ? null, libpcap ? null
-  , ...}:
+}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
 
-  buildInputs = map (n: builtins.getAttr n x)
+with stdenv.lib;
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+stdenv.mkDerivation rec {
-  sourceInfo = rec {
+  name = "libsrtp-${version}";
-    baseName="srtp";
+  version = "1.5.2";
-    version="1.4.4";
+
-    name="${baseName}-${version}";
+  src = fetchFromGitHub {
-    url="mirror://sourceforge/${baseName}/${name}.tgz";
+    owner = "cisco";
-    hash="057k191hx7sf84wdvc8wr1nk4whhrvbg1vv3r4nyswjir6qwphnr";
+    repo = "libsrtp";
-  };
+    rev = "v${version}";
-in
+    sha256 = "0iy1il72gnjcwbi16wf4kzdqs1xx8is9qvs6m49pg37218s26gdw";
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
   };
 
-  inherit (sourceInfo) name version;
+  buildInputs = [ pkgconfig ];
-  inherit buildInputs;
 
-  /* doConfigure should be removed if not needed */
+  # libsrtp.pc references -lcrypto -lpcap without -L
-  phaseNames = ["setVars" "doConfigure" "doMakeInstall"];
+  propagatedBuildInputs = [ openssl libpcap ];
 
-  setVars = a.fullDepEntry ''
+  configureFlags = [
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC"
+    "--disable-debug"
-  '' ["minInit"];
+  ] ++ optional (openssl != null) "--enable-openssl";
+
+  postInstall = ''
+    rmdir $out/bin
+  '';
 
   meta = {
-    description = "Secure RTP";
+    homepage = https://github.com/cisco/libsrtp;
-    maintainers = with a.lib.maintainers;
+    description = "Secure RTP (SRTP) Reference Implementation";
-    [
+    license = licenses.bsd3;
-      raskin
+    platforms = platforms.all;
-    ];
-    platforms = with a.lib.platforms;
-      linux;
   };
-  passthru = {
+}
-    updateInfo = {
-      downloadPage = "http://srtp.sourceforge.net/download.html";
-    };
-  };
-}) x
-

pkgs/development/libraries/srtp/linphone.nix

@@ -1,15 +0,0 @@
-{ stdenv, fetchgit, automake, autoconf, libtool }:
-
-stdenv.mkDerivation {
-  name = "srtp-linphone-git-20130530-1c9bd9065";
-
-  src = fetchgit {
-    url = git://git.linphone.org/srtp.git;
-    rev = "1c9bd9065";
-    sha256 = "0r4wbrih8bggs69fnfmzm17z1pp1zp8x9qwcckcq6wc54b16d9g3";
-  };
-
-  preConfigure = "autoreconf -vfi";
-
-  buildInputs = [ automake autoconf libtool ];
-}

pkgs/top-level/all-packages.nix

@@ -7548,9 +7548,9 @@ let
 
   srm = callPackage ../tools/security/srm { };
 
-  srtp = callPackage ../development/libraries/srtp {};
+  srtp = callPackage ../development/libraries/srtp {
-
+    libpcap = if stdenv.isLinux then libpcap else null;
-  srtp_linphone = callPackage ../development/libraries/srtp/linphone.nix { };
+  };
 
   stxxl = callPackage ../development/libraries/stxxl { parallel = true; };