Author: raskin Date: Tue May 31 09:09:35 2011 New Revision: 27333 URL: https://svn.nixos.org/websvn/nix/?rev=27333&sc=1
Log: Twinkle needs an older version of ccrtp Added: nixpkgs/trunk/pkgs/development/libraries/ccrtp/1.8.nix nixpkgs/trunk/pkgs/development/libraries/libzrtpcpp/1.6.nix Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix Added: nixpkgs/trunk/pkgs/development/libraries/ccrtp/1.8.nix ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ nixpkgs/trunk/pkgs/development/libraries/ccrtp/1.8.nix Tue May 31 09:09:35 2011 (r27333) @@ -0,0 +1,20 @@ +{ 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"; + }; + + buildInputs = [ openssl pkgconfig libgcrypt commoncpp2 ]; + + 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"; + maintainers = [ stdenv.lib.maintainers.marcweber ]; + platforms = stdenv.lib.platforms.linux; + }; +} Added: nixpkgs/trunk/pkgs/development/libraries/libzrtpcpp/1.6.nix ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ nixpkgs/trunk/pkgs/development/libraries/libzrtpcpp/1.6.nix Tue May 31 09:09:35 2011 (r27333) @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, commoncpp2, openssl, pkgconfig, ccrtp }: + +stdenv.mkDerivation rec { + name = "libzrtpcpp-1.6.0"; + + src = fetchurl { + url = "mirror://gnu/ccrtp/${name}.tar.gz"; + sha256 = "17aayr4f27rp4fvminxn6jx7kq56kkk341l7ypqb9h0k6kns27kb"; + }; + + buildInputs = [ commoncpp2 openssl pkgconfig ccrtp ]; + + meta = { + description = "GNU RTP stack for the zrtp protocol developed by Phil Zimmermann"; + homepage = "http://www.gnutelephony.org/index.php/GNU_ZRTP"; + license = "GPLv2"; + maintainers = [ stdenv.lib.maintainers.marcweber ]; + platforms = stdenv.lib.platforms.linux; + }; +} Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix ============================================================================== --- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue May 31 07:44:17 2011 (r27332) +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue May 31 09:09:35 2011 (r27333) @@ -2902,6 +2902,7 @@ scmccid = callPackage ../development/libraries/scmccid { }; ccrtp = callPackage ../development/libraries/ccrtp { }; + ccrtp_1_8 = callPackage ../development/libraries/ccrtp/1.8.nix { }; cgui = callPackage ../development/libraries/cgui {}; @@ -3881,6 +3882,9 @@ libzip = callPackage ../development/libraries/libzip { }; libzrtpcpp = callPackage ../development/libraries/libzrtpcpp { }; + libzrtpcpp_1_6 = callPackage ../development/libraries/libzrtpcpp/1.6.nix { + ccrtp = ccrtp_1_8; + }; lightning = callPackage ../development/libraries/lightning { }; @@ -6976,6 +6980,8 @@ twinkle = callPackage ../applications/networking/twinkle { qt = qt3; boost = boostFull; + ccrtp = ccrtp_1_8; + libzrtpcpp = libzrtpcpp_1_6; }; unison = callPackage ../applications/networking/sync/unison { _______________________________________________ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits