Add rekonq browser (both 0.4.0 and latest git)

svn path=/nixpkgs/trunk/; revision=21779

3 files changed, 52 insertions, 0 deletions

diff --git a/pkgs/applications/networking/browsers/rekonq/default.nix b/pkgs/applications/networking/browsers/rekonq/default.nix
new file mode 100644
index 000000000000..8c8b4774ceaa
--- /dev/null
+++ b/pkgs/applications/networking/browsers/rekonq/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, fetchgit, cmake, qt4, kdelibs, automoc4, phonon, perl
+, v ? "0.4.0" }:
+let
+  s = import ./source.nix { inherit fetchurl fetchgit; }; in
+
+stdenv.mkDerivation (
+  builtins.getAttr v (import ./source.nix { inherit fetchurl fetchgit; })
+  // {
+    buildInputs = [ cmake qt4 kdelibs automoc4 phonon perl ];
+
+    meta = with stdenv.lib; {
+      platforms = platforms.linux;
+      maintainers = [ maintainers.urkud ];
+      description = "KDE Webkit browser";
+      homepage = http://rekonq.sourceforge.net;
+    };
+  }
+)
diff --git a/pkgs/applications/networking/browsers/rekonq/source.nix b/pkgs/applications/networking/browsers/rekonq/source.nix
new file mode 100644
index 000000000000..a30de7bfbeeb
--- /dev/null
+++ b/pkgs/applications/networking/browsers/rekonq/source.nix
@@ -0,0 +1,27 @@
+{ fetchurl, fetchgit }:
+
+builtins.listToAttrs
+[
+  {
+    name = "0.4.0";
+    value = rec {
+      name = "rekonq-0.4.0";
+      src = fetchurl {
+        url = "mirror://sourceforge/rekonq/${name}.tar.bz2";
+        sha256 = "1dxpzkifqy85kwj94mhazan6f9glxvl7i02c50n3f0a12wiywwvy";
+      };
+    };
+  }
+
+  {
+    name = "scm";
+    value = {
+      name = "rekonq-0.4.0-20100514";
+      src = fetchgit {
+        url = git://gitorious.org/rekonq/mainline.git;
+        rev = "6b4f4d69a3c599bc958ccddc5f7ac1c8648a7042";
+        sha256 = "1qcwf7rsrnsbnq62cl44r48bmavc2nysi2wqhy1jxmj2ndwvsxy1";
+      };
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7eb15b903351..a341ad56197e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8342,6 +8342,13 @@ let
       libstdcpp5 = gcc33.gcc;
     });
 
+  rekonq = makeOverridable (import ../applications/networking/browsers/rekonq) {
+    inherit fetchurl fetchgit stdenv cmake perl;
+    inherit (kde4) qt4 kdelibs automoc4 phonon;
+  };
+
+  rekonqScm = rekonq.override { v = "scm"; };
+
   rsync = import ../applications/networking/sync/rsync {
     inherit fetchurl stdenv acl perl;
     enableACLs = !stdenv.isDarwin;