JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ikiwiki: Fix docutils support

Browse Source 
Without this, the rst plugin complains as follows:

    cannot import docutils.core

Also, python3 is needed for the rst plugin to work.
This commit is contained in:
Michal Sojka 2020-10-08 15:00:30 +02:00
parent 7e63308148
commit 40a5a4c46e
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/applications/misc/ikiwiki/default.nix
View File

@ -69,6 +69,7 @@ stdenv.mkDerivation {
${lib.optionalString cvsSupport ''--prefix PATH : ${cvsps}/bin ''} \ ${lib.optionalString cvsSupport ''--prefix PATH : ${cvsps}/bin ''} \
${lib.optionalString subversionSupport ''--prefix PATH : ${subversion.out}/bin ''} \ ${lib.optionalString subversionSupport ''--prefix PATH : ${subversion.out}/bin ''} \
${lib.optionalString mercurialSupport ''--prefix PATH : ${mercurial}/bin ''} \ ${lib.optionalString mercurialSupport ''--prefix PATH : ${mercurial}/bin ''} \
${lib.optionalString docutilsSupport ''--prefix PYTHONPATH : "$(toPythonPath ${docutils})" ''} \
${lib.concatMapStrings (x: "--prefix PATH : ${x}/bin ") extraUtils} ${lib.concatMapStrings (x: "--prefix PATH : ${x}/bin ") extraUtils}
done done
''; '';

1
pkgs/top-level/all-packages.nix
View File

@ -21310,6 +21310,7 @@ in
ike = callPackage ../applications/networking/ike { }; ike = callPackage ../applications/networking/ike { };
ikiwiki = callPackage ../applications/misc/ikiwiki { ikiwiki = callPackage ../applications/misc/ikiwiki {
python = python3;
inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) PerlMagick; inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) PerlMagick;
}; };