From 3c2c4ac87a11b6b522dc69663d373a3c6349dbf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 6 Apr 2010 19:39:29 +0000
Subject: [PATCH] Adding 'meld'

svn path=/nixpkgs/trunk/; revision=20963
---
 .../version-management/meld/default.nix       | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 +++++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/applications/version-management/meld/default.nix

diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
new file mode 100644
index 000000000000..9a4c58d11c48
--- /dev/null
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -0,0 +1,27 @@
+{stdenv, fetchurl, pygtk, python, intltool, scrollkeeper, makeWrapper }:
+
+stdenv.mkDerivation {
+  name = "meld-1.3.1";
+
+  src = fetchurl {
+    url = http://ftp.gnome.org/pub/gnome/sources/meld/1.3/meld-1.3.1.tar.bz2;
+    sha256 = "0iqnj3qb9l7z12akgmf64fr2xqirsqxflvj60xqcqr5vd5c763nn";
+  };
+
+  buildInputs = [ pygtk python intltool scrollkeeper makeWrapper ];
+
+  patchPhase = ''
+    sed -e s,/usr/local,$out, -i INSTALL
+    sed -e 's,#!.*,#!${python}/bin/python,' -i meld
+  '';
+
+  postInstall = ''
+    wrapProgram $out/bin/meld --prefix PYTHONPATH : $PYTHONPATH:${pygtk}/lib/${python.libPrefix}/site-packages/gtk-2.0
+  '';
+
+  meta = {
+    description = "Visual diff and merge tool";
+    homepage = http://meld.sourceforge.net;
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f34c4f6fc534..2fb62c64dbff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7686,6 +7686,12 @@ let
    qt = qt4;
   };
 
+  meld = import ../applications/version-management/meld {
+    inherit fetchurl stdenv python intltool makeWrapper;
+    inherit (gnome) scrollkeeper;
+    pygtk = pyGtkGlade;
+  };
+
   mercurial = import ../applications/version-management/mercurial {
     inherit fetchurl stdenv makeWrapper getConfig tk;
     guiSupport = getConfig ["mercurial" "guiSupport"] false; # for hgk (gitk gui for hg)