From cce9e298b8b53e5f9d5bfadcf51b9fcef490499b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 16 Apr 2013 14:53:01 +0200 Subject: [PATCH] Changing the source of skype4pidgin This github fork works fine, while the previous (original) only segfaults. --- .../pidgin-plugins/skype4pidgin/default.nix | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix index ffa98e47520..544aa06877a 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix @@ -1,22 +1,19 @@ -{ stdenv, fetchsvn, pkgconfig, pidgin, libnotify, gdk_pixbuf, glib, dbus +{ stdenv, fetchurl, pkgconfig, pidgin, libnotify, gdk_pixbuf, glib, dbus , dbus_glib }: -let - rev = 657; -in stdenv.mkDerivation rec { - name = "skype4pidgin-svn-657"; - src = fetchsvn { - url = "http://skype4pidgin.googlecode.com/svn/trunk"; - inherit rev; - sha256 = "0sg91rqkg6mjdkwxjbs7bmh65sm5sj6fzygkfiz8av3zjzmj127b"; + name = "skype4pidgin-novas0x2a-20120411-6c53f7c48f"; + src = fetchurl { + url = "https://github.com/novas0x2a/skype4pidgin/tarball/6c53f7c48f"; + name = "${name}.tar.gz"; + sha256 = "116jfh5ravaixivqx4a4bz0lbb9c49d5r83nwmripja56zdbpgr0"; }; NIX_CFLAGS_COMPILE = "-I${libnotify}/include/libnotify"; patchPhase = '' sed -i -e 's/ [^ ]*-gcc/ gcc/' -e 's/-march[^ ]*//' \ - -e 's/glib-2.0/glib-2.0 gdk-pixbuf-2.0 libnotify purple dbus-glib-1/' Makefile + -e 's/GLIB_CFLAGS =.*/GLIB_CFLAGS=`pkg-config --cflags glib-2.0 gdk-pixbuf-2.0 libnotify purple dbus-glib-1`/' Makefile pkg-config --cflags glib-2.0 gdk-pixbuf-2.0 libnotify ''; @@ -33,4 +30,10 @@ stdenv.mkDerivation rec { postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr"; buildInputs = [ pidgin pkgconfig libnotify gdk_pixbuf glib dbus dbus_glib ]; + + meta = { + homepage = https://github.com/novas0x2a/skype4pidgin; + license = "GPLv3+"; + description = "Plugin to use a running skype account through pidgin"; + }; }