From bdedaae691dcf0661595fc1fe10dd7ae5972bf6b Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 27 May 2013 07:42:38 +0200 Subject: [PATCH] gajim: Enable SRV support using drill from ldns. Use a patch from Arch Linux to use drill instead of nslookup. The primary reason for this is because nslookup is in bind, and we don't want to depend on the whole bind package just for the sake of supporting SRV lookups. Signed-off-by: aszlig --- .../instant-messengers/gajim/default.nix | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 7bb5207bb3d..c8c3f3b7d2a 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, intltool, pkgconfig, libX11, gtk -, pyopenssl, pythonDBus, pythonPackages +, ldns, pyopenssl, pythonDBus, pythonPackages , enableJingle ? true, farstream ? null, gst_plugins_bad ? null , libnice ? null @@ -25,11 +25,19 @@ stdenv.mkDerivation rec { sha256 = "1g4m5j777vqqdwqvr2m6l09ljjx65ilag45d5kfc78z7frm0cz7g"; }; - patches = singleton (fetchurl { - name = "gajim-icon-index.patch"; - url = "http://hg.gajim.org/gajim/raw-rev/b9ec78663dfb"; - sha256 = "0w54hr5dq9y36val55kmh8d6cid7h4fs2nghx09714jylz2nyxxv"; - }); + patches = [ + (fetchurl { + name = "gajim-drill-srv.patch"; + url = "https://projects.archlinux.org/svntogit/packages.git/" + + "plain/trunk/gajim-drill.patch?h=packages/gajim"; + sha256 = "1k8zz3ns0l0kriffq41jgkv5ym6jvyd24171l7s98v9d81prdw1w"; + }) + (fetchurl { + name = "gajim-icon-index.patch"; + url = "http://hg.gajim.org/gajim/raw-rev/b9ec78663dfb"; + sha256 = "0w54hr5dq9y36val55kmh8d6cid7h4fs2nghx09714jylz2nyxxv"; + }) + ]; postPatch = '' sed -i -e '0,/^[^#]/ {