From c77f6a0c2fb99235d8eca2b8b09c54b655999d2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 26 Jun 2013 23:47:09 +0200 Subject: [PATCH] As libccrtp propagates ucommon, it's not needed in libzrtpcpp. --- pkgs/development/libraries/libzrtpcpp/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libzrtpcpp/default.nix b/pkgs/development/libraries/libzrtpcpp/default.nix index 9e569eea580b..02741bc6fa11 100644 --- a/pkgs/development/libraries/libzrtpcpp/default.nix +++ b/pkgs/development/libraries/libzrtpcpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, ucommon, openssl, pkgconfig, ccrtp }: +{ stdenv, fetchurl, cmake, openssl, pkgconfig, ccrtp }: stdenv.mkDerivation rec { name = "libzrtpcpp-2.0.0"; @@ -8,7 +8,12 @@ stdenv.mkDerivation rec { sha256 = "05yw8n5xpj0jxkvzgsvn3xkxirpypc1japy9k1jqs9301fgb1a3i"; }; - buildInputs = [ cmake ucommon openssl pkgconfig ccrtp ]; + # We disallow 'lib64', or pkgconfig will not find it. + prePatch = '' + sed -i s/lib64/lib/ CMakeLists.txt + ''; + + buildInputs = [ cmake openssl pkgconfig ccrtp ]; meta = { description = "GNU RTP stack for the zrtp protocol developed by Phil Zimmermann";