From 32b417e87381145ebfe8a23bad439ad5701d5e55 Mon Sep 17 00:00:00 2001
From: Jonas Hoersch <coroa@online.de>
Date: Sun, 29 Sep 2013 17:13:21 +0200
Subject: [PATCH 1/3] maintainers: add coroa as a maintainer

---
 pkgs/lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix
index a6ef3b9c07f3..83cff57f7489 100644
--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@@ -19,6 +19,7 @@
   bodil = "Bodil Stokke <nix@bodil.org>";
   chaoflow = "Florian Friesdorf <flo@chaoflow.net>";
   coconnor = "Corey O'Connor <coreyoconnor@gmail.com>";
+  coroa = "Jonas Hörsch <jonas@chaoflow.net>";
   edwtjo = "Edward Tjörnhammar <ed@cflags.cc>";
   eelco = "Eelco Dolstra <eelco.dolstra@logicblox.com>";
   ertes = "Ertugrul Söylemez <es@ertes.de>";

From 69221b604603eed95f979fe0c332792a8978eed5 Mon Sep 17 00:00:00 2001
From: Jonas Hoersch <coroa@online.de>
Date: Sat, 28 Sep 2013 09:00:17 +0200
Subject: [PATCH 2/3] libunibreak: Add libunibreak-1.0 a unicode line breaking
 library

---
 .../libraries/libunibreak/default.nix          | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix                |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/development/libraries/libunibreak/default.nix

diff --git a/pkgs/development/libraries/libunibreak/default.nix b/pkgs/development/libraries/libunibreak/default.nix
new file mode 100644
index 000000000000..e5e7f5ff0ae8
--- /dev/null
+++ b/pkgs/development/libraries/libunibreak/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "libunibreak-${version}";
+  version = "1.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/vimgadgets/libunibreak/${version}/${name}.tar.gz";
+    sha256 = "0rsivyxnp9nfngf83fiy4v58s5mgdhcjz75nv5nyhxwxnjq35d25";
+  };
+
+  meta = {
+    homepage = http://vimgadgets.sourceforge.net/libunibreak/;
+    description = "A library implementing a line breaking algorithm as described in Unicode 6.0.0 Standard";
+    license = "ZLIB";
+    maintainer = [ stdenv.lib.maintainers.coroa ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3e3f9798d5c5..a97feae496e9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4970,6 +4970,8 @@ let
 
   libungif = callPackage ../development/libraries/giflib/libungif.nix { };
 
+  libunibreak = callPackage ../development/libraries/libunibreak/default.nix { };
+
   libunique = callPackage ../development/libraries/libunique/default.nix { };
 
   liburcu = callPackage ../development/libraries/liburcu { };

From b260d7111aa776e2c2e436d3443590c22c3d758f Mon Sep 17 00:00:00 2001
From: Jonas Hoersch <coroa@online.de>
Date: Sun, 29 Sep 2013 02:42:50 +0200
Subject: [PATCH 3/3] Add fbreader, an e-book reader for Linux

---
 pkgs/applications/misc/fbreader/default.nix | 34 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/applications/misc/fbreader/default.nix

diff --git a/pkgs/applications/misc/fbreader/default.nix b/pkgs/applications/misc/fbreader/default.nix
new file mode 100644
index 000000000000..fa361308ff1a
--- /dev/null
+++ b/pkgs/applications/misc/fbreader/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, pkgconfig, bzip2, curl, expat, fribidi
+, libunibreak, qt4, sqlite, zlib }:
+
+stdenv.mkDerivation {
+  name = "fbreader-0.99.4";
+
+  src = fetchurl {
+    url = http://fbreader.org/files/desktop/fbreader-sources-0.99.4.tgz;
+    sha256 = "1sdq3vvwkq4bkyrvh0p884d66gaddz8hlab3m798ji9ixbak2z1x";
+  };
+
+  buildInputs = [
+    pkgconfig bzip2 curl expat fribidi libunibreak
+    qt4 sqlite zlib
+  ];
+
+  makeFlags = "INSTALLDIR=$(out)";
+
+  patchPhase = ''
+    # don't try to use ccache
+    substituteInPlace makefiles/arch/desktop.mk \
+      --replace "CCACHE = " "# CCACHE = "
+  
+    substituteInPlace fbreader/desktop/Makefile \
+      --replace "/usr/share" "$out/share"
+  '';
+
+  meta = {
+    description = "An e-book reader for Linux";
+    homepage = http://www.fbreader.org/;
+    license = "GPL";
+    maintainer = [ stdenv.lib.maintainers.coroa ];
+  }; 
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a97feae496e9..1c6b3789c252 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7636,6 +7636,8 @@ let
 
   fbpanel = callPackage ../applications/window-managers/fbpanel { };
 
+  fbreader = callPackage ../applications/misc/fbreader { };
+
   fetchmail = import ../applications/misc/fetchmail {
     inherit stdenv fetchurl openssl;
   };