diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-13 19:06:38 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-13 19:06:38 +0000 |
| commit | 23154538b7b8415ff5c660290536f345206c726d (patch) | |
| tree | e0f2ab5ee458f7fa7b26ca85bedf34c4b4fbd4a5 /pkgs/development | |
| parent | fb422d45dd9a2f4a2edecb76637ec4b169a09ed9 (diff) | |
| download | nixlib-23154538b7b8415ff5c660290536f345206c726d.tar nixlib-23154538b7b8415ff5c660290536f345206c726d.tar.gz nixlib-23154538b7b8415ff5c660290536f345206c726d.tar.bz2 nixlib-23154538b7b8415ff5c660290536f345206c726d.tar.lz nixlib-23154538b7b8415ff5c660290536f345206c726d.tar.xz nixlib-23154538b7b8415ff5c660290536f345206c726d.tar.zst nixlib-23154538b7b8415ff5c660290536f345206c726d.zip | |
telepathy-glib-0.17.5
Adjust .pc to our patched pkg-config svn path=/nixpkgs/trunk/; revision=33042
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/telepathy-glib/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/telepathy-glib/fix-pkgconfig.patch | 14 |
2 files changed, 18 insertions, 2 deletions
diff --git a/pkgs/development/libraries/telepathy-glib/default.nix b/pkgs/development/libraries/telepathy-glib/default.nix index 5864253bbb41..31301d44f49a 100644 --- a/pkgs/development/libraries/telepathy-glib/default.nix +++ b/pkgs/development/libraries/telepathy-glib/default.nix @@ -1,16 +1,18 @@ { stdenv, fetchurl, dbus_glib, glib, python, pkgconfig, libxslt }: stdenv.mkDerivation rec { - name = "telepathy-glib-0.7.0"; + name = "telepathy-glib-0.17.5"; src = fetchurl { url = "${meta.homepage}/releases/telepathy-glib/${name}.tar.gz"; - sha256 = "0hf1jrgisr7skrji7djh66q0ic351vlsm65xqy982p5d0axzxkz5"; + sha256 = "13gylgwgjp29zakzj5kb4h0j5zh30dsl8ch7hp3dp4nmy4vdj6h1"; }; propagatedBuildInputs = [dbus_glib glib python]; buildInputs = [pkgconfig libxslt]; + + patches = [ ./fix-pkgconfig.patch ]; meta = { homepage = http://telepathy.freedesktop.org; diff --git a/pkgs/development/libraries/telepathy-glib/fix-pkgconfig.patch b/pkgs/development/libraries/telepathy-glib/fix-pkgconfig.patch new file mode 100644 index 000000000000..78c3e6af0414 --- /dev/null +++ b/pkgs/development/libraries/telepathy-glib/fix-pkgconfig.patch @@ -0,0 +1,14 @@ +Adjust telepathy-glib.pc to our version of pkg-config +diff --git a/telepathy-glib/telepathy-glib.pc.in b/telepathy-glib/telepathy-glib.pc.in +index e2ddf03..6038011 100644 +--- a/telepathy-glib/telepathy-glib.pc.in ++++ b/telepathy-glib/telepathy-glib.pc.in +@@ -6,7 +6,6 @@ includedir=@includedir@ + Name: Telepathy-GLib + Description: GLib utility library for the Telepathy framework + Version: @VERSION@ +-Requires: pkg-config >= 0.21 +-Requires.private: dbus-glib-1 >= 0.82, glib-2.0 >= 2.24, gobject-2.0 >= 2.24, gio-2.0 >= 2.24 ++Requires: pkg-config >= 0.21 dbus-glib-1 >= 0.82, glib-2.0 >= 2.24, gobject-2.0 >= 2.24, gio-2.0 >= 2.24 + Libs: -L${libdir} -ltelepathy-glib + Cflags: -I${includedir}/telepathy-1.0 |