From 58f6da5cc6b96b65c3211fa5a1ab6eb6fc7d1305 Mon Sep 17 00:00:00 2001
From: Igor Pashev <pashev.igor@gmail.com>
Date: Tue, 2 Jun 2015 06:06:02 +0000
Subject: [PATCH 1/2] mwlib may use imagemagick (convert)

---
 nixos/modules/services/misc/mwlib.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/misc/mwlib.nix b/nixos/modules/services/misc/mwlib.nix
index fb4a24253df4..fb349fbeab5a 100644
--- a/nixos/modules/services/misc/mwlib.nix
+++ b/nixos/modules/services/misc/mwlib.nix
@@ -226,6 +226,7 @@ in
         chmod -Rc u=rwX,go= '${cfg.nslave.cachedir}'
       '';
 
+      path = with pkgs; [ imagemagick ];
       environment = {
         PYTHONPATH = concatMapStringsSep ":"
           (m: "${pypkgs.${m}}/lib/${python.libPrefix}/site-packages")

From 95c6b835cb064cfdbf06bcfed7341e54e6cd31ee Mon Sep 17 00:00:00 2001
From: Igor Pashev <pashev.igor@gmail.com>
Date: Tue, 2 Jun 2015 06:14:34 +0000
Subject: [PATCH 2/2] mwlib may use pyfribidi

---
 nixos/modules/services/misc/mwlib.nix |  2 +-
 pkgs/top-level/python-packages.nix    | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/mwlib.nix b/nixos/modules/services/misc/mwlib.nix
index fb349fbeab5a..d02e1e021a70 100644
--- a/nixos/modules/services/misc/mwlib.nix
+++ b/nixos/modules/services/misc/mwlib.nix
@@ -230,7 +230,7 @@ in
       environment = {
         PYTHONPATH = concatMapStringsSep ":"
           (m: "${pypkgs.${m}}/lib/${python.libPrefix}/site-packages")
-          [ "mwlib-rl" "mwlib-ext" "pygments" ];
+          [ "mwlib-rl" "mwlib-ext" "pygments" "pyfribidi" ];
       };
 
       serviceConfig = {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b9a1eaf32ed9..1f389a2833f2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4991,6 +4991,22 @@ let
     };
   });
 
+  pyfribidi = buildPythonPackage rec {
+    version = "0.11.0";
+    name = "pyfribidi-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/pyfribidi/${name}.zip";
+      md5 = "a3fc1f9d34571305782d1a54ee36f904";
+    };
+
+    meta = {
+      description = "simple wrapper around fribidi.";
+      homepage = "https://github.com/pediapress/pyfribidi";
+      license = stdenv.lib.licenses.gpl2;
+    };
+  };
+
   docker_compose = buildPythonPackage rec {
     name = "docker-compose-1.2.0rc2";
     disabled = isPy3k || isPyPy;