public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

telepathy: 0.5.3 -> 0.8.80

Browse Source
This commit is contained in:
Domen Kožar
2014-10-02 11:14:23 +02:00
parent 2e51b2e18a
commit 1b929642ea
5 changed files with 24 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/telepathy/qt/default.nix
View File

@@ -2,15 +2,13 @@
, telepathy_farstream, telepathy_glib, pythonDBus }:
stdenv.mkDerivation rec {
name = "telepathy-qt-0.9.4";
name = "telepathy-qt-0.9.5";
src = fetchurl {
url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz";
sha256 = "1wk13rwpas1crj19xsbgl1c4qzri616xxa1hyhnykv4nkwxdpcgi";
sha256 = "13lwh23ad9bg7hx1mj4xjc2lb8nlaaw8hbrmx5gg8nz5xxc4hiwk";
};
patches = [ ./farstream-0.2.diff ];
nativeBuildInputs = [ cmake pkgconfig python libxslt ];
propagatedBuildInputs = [ qt4 dbus_glib telepathy_farstream telepathy_glib pythonDBus ];

28
pkgs/development/libraries/telepathy/qt/farstream-0.2.diff
View File

@@ -1,28 +0,0 @@
diff -urB telepathy-qt/cmake/modules/FindFarstream.cmake new/cmake/modules/FindFarstream.cmake
--- telepathy-qt/cmake/modules/FindFarstream.cmake 2012-04-25 22:14:22.275967164 +0200
+++ new/cmake/modules/FindFarstream.cmake 2012-10-07 12:19:46.543103512 +0200
@@ -23,9 +23,9 @@
# in the find_path() and find_library() calls
find_package(PkgConfig)
if (FARSTREAM_MIN_VERSION)
- PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.1>=${FARSTREAM_MIN_VERSION})
+ PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.2>=${FARSTREAM_MIN_VERSION})
else (FARSTREAM_MIN_VERSION)
- PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.1)
+ PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.2)
endif (FARSTREAM_MIN_VERSION)
set(FARSTREAM_DEFINITIONS ${PC_FARSTREAM_CFLAGS_OTHER})
endif (NOT WIN32)
@@ -34,10 +34,10 @@
PATHS
${PC_FARSTREAM_INCLUDEDIR}
${PC_FARSTREAM_INCLUDE_DIRS}
- PATH_SUFFIXES farstream-0.1
+ PATH_SUFFIXES farstream-0.2
)
-find_library(FARSTREAM_LIBRARIES NAMES farstream-0.1
+find_library(FARSTREAM_LIBRARIES NAMES farstream-0.2
PATHS
${PC_FARSTREAM_LIBDIR}
${PC_FARSTREAM_LIBRARY_DIRS}