diff options
| -rw-r--r-- | pkgs/applications/misc/ikiwiki/default.nix | 22 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
2 files changed, 21 insertions, 9 deletions
diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 804064617756..69faf81122a3 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -1,7 +1,9 @@ -{stdenv, fetchurl, perl, gettext, makeWrapper, -TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate, -CGISession, CGIFormBuilder, DBFile, -git}: +{stdenv, fetchurl, perl, gettext, makeWrapper, lib, + TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate, + CGISession, CGIFormBuilder, DBFile + , git ? null + , monotone ? null + }: stdenv.mkDerivation { name = "ikiwiki_3.20091009"; @@ -12,7 +14,10 @@ stdenv.mkDerivation { }; buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate - TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder ]; + TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder ] + ++ + (lib.optional (monotone != null) monotone) + ; patchPhase = '' sed -i s@/usr/bin/perl@${perl}/bin/perl@ pm_filter mdwn2man @@ -27,7 +32,12 @@ stdenv.mkDerivation { postInstall = '' for a in $out/bin/*; do - wrapProgram $a --suffix PERL5LIB : $PERL5LIB --prefix PATH : ${perl}/bin:$out/bin:${git}/bin + wrapProgram $a --suffix PERL5LIB : $PERL5LIB --prefix PATH : ${perl}/bin:$out/bin \ + ${lib.optionalString (git != null) + ''--prefix PATH : ${git}/bin \''} + ${lib.optionalString (monotone != null) + ''--prefix PATH : ${monotone}/bin \''} + done ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 403fbb8da528..a97269eeadee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7128,10 +7128,12 @@ let inherit (xlibs) libX11 libXft libXext libXinerama libXrandr; }; - ikiwiki = import ../applications/misc/ikiwiki { - inherit fetchurl stdenv perl gettext makeWrapper; - inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder; + ikiwiki = makeOverridable (import ../applications/misc/ikiwiki) { + inherit fetchurl stdenv perl gettext makeWrapper lib; + inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber + HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder; inherit git; # The RCS should be optional + monotone = null; }; imagemagick = import ../applications/graphics/ImageMagick { |