summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-04-06 14:45:48 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-04-06 20:12:07 -0700
commite596f6dab7a22af19a1511236aac7593c44bb593 (patch)
treee5d69c2b8f8f0ad89c1e7b49ae7f2a94251df289 /pkgs
parentfe4997d58de452791c5dfd95a9df5c8a22d93a11 (diff)
downloadnixpkgs-e596f6dab7a22af19a1511236aac7593c44bb593.tar
nixpkgs-e596f6dab7a22af19a1511236aac7593c44bb593.tar.gz
nixpkgs-e596f6dab7a22af19a1511236aac7593c44bb593.tar.bz2
nixpkgs-e596f6dab7a22af19a1511236aac7593c44bb593.tar.lz
nixpkgs-e596f6dab7a22af19a1511236aac7593c44bb593.tar.xz
nixpkgs-e596f6dab7a22af19a1511236aac7593c44bb593.tar.zst
nixpkgs-e596f6dab7a22af19a1511236aac7593c44bb593.zip
ccrtp: 2.0.9 -> 2.1.2
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/ccrtp/default.nix18
-rw-r--r--pkgs/top-level/all-packages.nix1
2 files changed, 12 insertions, 7 deletions
diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix
index ade48cb2288..13a9259fdec 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 025e84636a0..1cf013c0061 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 {};