From f45cfbe272abd3d290346e69d255f30813d1f17b Mon Sep 17 00:00:00 2001
From: Alexander Tsamutali <astsmtl@yandex.ru>
Date: Sat, 24 Apr 2010 17:34:58 +0000
Subject: [PATCH] conkeror: New nixpkg.

svn path=/nixpkgs/trunk/; revision=21296
---
 .../networking/browsers/conkeror/default.nix  | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  7 +++++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/applications/networking/browsers/conkeror/default.nix

diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix
new file mode 100644
index 00000000000..e0d62792918
--- /dev/null
+++ b/pkgs/applications/networking/browsers/conkeror/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl }:
+stdenv.mkDerivation {
+  name = "conkeror-0.9.2";
+  src = fetchurl {
+    url = http://repo.or.cz/w/conkeror.git/snapshot/efacc207b0d6c7b3899fc584c9f48547b18da076.tar.gz;
+    sha256 = "179rkf32p83dzgfjghc4kglb03h8aivddliynsydr6zxy8c4p28f";
+  };
+  installPhase = ''
+    cp -r . $out
+  '';
+  meta = {
+    description = "A keyboard-oriented, customizable, extensible web browser";
+    longDescription = ''
+      Conkeror is a keyboard-oriented, highly-customizable, highly-extensible
+      web browser based on Mozilla XULRunner, written mainly in JavaScript,
+      and inspired by exceptional software such as Emacs and vi. Conkeror
+      features a sophisticated keyboard system, allowing users to run commands
+      and interact with content in powerful and novel ways. It is
+      self-documenting, featuring a powerful interactive help system.
+    '';
+    homepage = http://conkeror.org/;
+    license = [ "MPLv1.1" "GPLv2" "LGPLv2.1" ];
+    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 97d245b5058..c9165223fda 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7029,6 +7029,13 @@ let
     wxGTK = wxGTK26;
   };
 
+  conkeror = xulrunnerWrapper {
+    launcher = "conkeror";
+    application = import ../applications/networking/browsers/conkeror {
+      inherit stdenv fetchurl;
+    };
+  };
+
   cuneiform = builderDefsPackage (import ../tools/graphics/cuneiform) {
     inherit cmake patchelf;
     imagemagick=imagemagick;