From f68b2277b7d2f79adf6872a8461961b81f250af4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 15 Mar 2010 14:26:52 +0000
Subject: [PATCH] Adding qshowdiff.

svn path=/nixpkgs/trunk/; revision=20633
---
 pkgs/tools/text/qshowdiff/default.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  5 +++++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/tools/text/qshowdiff/default.nix

diff --git a/pkgs/tools/text/qshowdiff/default.nix b/pkgs/tools/text/qshowdiff/default.nix
new file mode 100644
index 000000000000..ee87bffc6729
--- /dev/null
+++ b/pkgs/tools/text/qshowdiff/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, qt, perl}:
+
+stdenv.mkDerivation rec {
+  name = "qshowdiff-1.2";
+  
+  src = fetchurl {
+    url = http://qshowdiff.danfis.cz/files/qshowdiff-1.2.tar.gz;
+    sha256 = "0i3ssvax4xync9c53jaxribazvh8d8v148l3yiqsfjmqsggw9rh3";
+  };
+
+  buildInputs = [ qt perl ];
+
+  configurePhase = ''
+    ensureDir $out/{bin,man/man1}
+    makeFlags="PREFIX=$out"
+  '';
+
+  meta = {
+    homepage = http://qshowdiff.danfis.cz/;
+    description = "Colourful diff viewer";
+    license = "GPLv3+";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 37c6e5238b1e..f245eb59dc4d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1422,6 +1422,11 @@ let
     inherit stdenv fetchurl;
   };
 
+  qshowdiff = import ../tools/text/qshowdiff {
+    inherit fetchurl stdenv perl;
+    qt = qt4;
+  };
+
   reiser4progs = import ../tools/filesystems/reiser4progs {
     inherit fetchurl stdenv libaal;
   };