From e596f6dab7a22af19a1511236aac7593c44bb593 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 6 Apr 2015 14:45:48 -0700 Subject: [PATCH] ccrtp: 2.0.9 -> 2.1.2 --- pkgs/development/libraries/ccrtp/default.nix | 18 +++++++++++------- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix index ade48cb22888..13a9259fdec9 100644 --- a/pkgs/development/libraries/ccrtp/default.nix +++ b/pkgs/development/libraries/ccrtp/default.nix @@ -1,15 +1,19 @@ -{ stdenv, fetchurl, openssl, pkgconfig, libgcrypt, ucommon }: +{ stdenv, fetchurl, pkgconfig, ucommon, openssl, libgcrypt }: -stdenv.mkDerivation { - name = "ccrtp-2.0.9"; +stdenv.mkDerivation rec { + name = "ccrtp-2.1.2"; src = fetchurl { - url = mirror://gnu/ccrtp/ccrtp-2.0.9.tar.gz; - sha256 = "1prh2niwa4lzvskk12j4ckr7dv141dfh8yjmpkbhbnv4gmpifci0"; + url = "mirror://gnu/ccrtp/${name}.tar.gz"; + sha256 = "17ili8l7zqbbkzr1rcy4hlnazkf50mds41wg6n7bfdsx3c7cldgh"; }; - buildInputs = [ openssl pkgconfig libgcrypt ]; - propagatedBuildInputs = [ ucommon ]; + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ ucommon openssl libgcrypt ]; + + configureFlags = [ + "--disable-demos" + ]; doCheck = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 025e84636a0d..1cf013c00610 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5501,6 +5501,7 @@ let scmccid = callPackage ../development/libraries/scmccid { }; ccrtp = callPackage ../development/libraries/ccrtp { }; + ccrtp_1_8 = callPackage ../development/libraries/ccrtp/1.8.nix { }; celt = callPackage ../development/libraries/celt {};