diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-06-13 07:09:23 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-06-13 07:09:23 +0000 |
| commit | 5487fbe94add5b70ba1a21fc8006b77e181aeb06 (patch) | |
| tree | b3c700b3029f3fc95b03d0fcafd8f0faba73e0cc /pkgs/development/libraries/telepathy | |
| parent | 316222e2e1f60d5b213080a2f7e50d1e5dc66e32 (diff) | |
| download | nixpkgs-5487fbe94add5b70ba1a21fc8006b77e181aeb06.tar nixpkgs-5487fbe94add5b70ba1a21fc8006b77e181aeb06.tar.gz nixpkgs-5487fbe94add5b70ba1a21fc8006b77e181aeb06.tar.bz2 nixpkgs-5487fbe94add5b70ba1a21fc8006b77e181aeb06.tar.lz nixpkgs-5487fbe94add5b70ba1a21fc8006b77e181aeb06.tar.xz nixpkgs-5487fbe94add5b70ba1a21fc8006b77e181aeb06.tar.zst nixpkgs-5487fbe94add5b70ba1a21fc8006b77e181aeb06.zip | |
telepathy-glib-0.18.1 (0.19.x requires glib-2.32.x)
Drop pkg-config patch, pass pkgconfigUpstream to rakia and salut. svn path=/nixpkgs/trunk/; revision=34495
Diffstat (limited to 'pkgs/development/libraries/telepathy')
| -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, 2 insertions, 18 deletions
diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index 22a6aef5c3a..b31338a6595 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -1,19 +1,17 @@ { stdenv, fetchurl, dbus_glib, glib, python, pkgconfig, libxslt }: stdenv.mkDerivation rec { - name = "telepathy-glib-0.17.7"; + name = "telepathy-glib-0.18.1"; src = fetchurl { url = "${meta.homepage}/releases/telepathy-glib/${name}.tar.gz"; - sha256 = "1brzw0cqawcyh7rffzbmydzbymrrsmzf8rksgamiqpwsdvcnksxz"; + sha256 = "0vac5wk9rpaniqxwa50szcc5ql779ks37sy4z7fj4k73i5k2af1p"; }; 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 deleted file mode 100644 index bba92d408a0..00000000000 --- a/pkgs/development/libraries/telepathy/glib/fix-pkgconfig.patch +++ /dev/null @@ -1,14 +0,0 @@ -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-1 >= 0.95, dbus-glib-1 >= 0.90, glib-2.0 >= 2.30, gobject-2.0 >= 2.30, gio-2.0 >= 2.30 -+Requires: pkg-config >= 0.21 dbus-1 >= 0.95, dbus-glib-1 >= 0.90, glib-2.0 >= 2.30, gobject-2.0 >= 2.30, gio-2.0 >= 2.30 - Libs: -L${libdir} -ltelepathy-glib - Cflags: -I${includedir}/telepathy-1.0 |