From 40a5a4c46ed512423685f9ab8ae25ec88d675496 Mon Sep 17 00:00:00 2001
From: Michal Sojka <michal.sojka@cvut.cz>
Date: Thu, 8 Oct 2020 15:00:30 +0200
Subject: [PATCH] ikiwiki: Fix docutils support

Without this, the rst plugin complains as follows:

    cannot import docutils.core

Also, python3 is needed for the rst plugin to work.
---
 pkgs/applications/misc/ikiwiki/default.nix | 1 +
 pkgs/top-level/all-packages.nix            | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix
index c940f824f37..c97ea3d4b77 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@@ -69,6 +69,7 @@ stdenv.mkDerivation {
       ${lib.optionalString cvsSupport ''--prefix PATH : ${cvsps}/bin ''} \
       ${lib.optionalString subversionSupport ''--prefix PATH : ${subversion.out}/bin ''} \
       ${lib.optionalString mercurialSupport ''--prefix PATH : ${mercurial}/bin ''} \
+      ${lib.optionalString docutilsSupport ''--prefix PYTHONPATH : "$(toPythonPath ${docutils})" ''} \
       ${lib.concatMapStrings (x: "--prefix PATH : ${x}/bin ") extraUtils}
     done
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bc1ab0f1c08..f3eaa453677 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21310,6 +21310,7 @@ in
   ike = callPackage ../applications/networking/ike { };
 
   ikiwiki = callPackage ../applications/misc/ikiwiki {
+    python = python3;
     inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) PerlMagick;
   };