diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-10-15 22:08:35 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-10-15 22:08:35 +0000 |
commit | 54a04a789aa3e98ddc5a88fca4b602ffbb6d04c0 (patch) | |
tree | 11029b1e8e58a8c6b1812029829cbcc7c9dfbf99 /pkgs/applications/misc | |
parent | ffe3d659862801466002ed710405b89df7230f43 (diff) |
Made ikiwiki work at least using 'git'. I tested the CGI this time.
I had to add some perl modules again.
svn path=/nixpkgs/trunk/; revision=17838
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/ikiwiki/default.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index b830bc282476..804064617756 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -1,5 +1,7 @@ {stdenv, fetchurl, perl, gettext, makeWrapper, -TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate}: +TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate, +CGISession, CGIFormBuilder, DBFile, +git}: stdenv.mkDerivation { name = "ikiwiki_3.20091009"; @@ -10,19 +12,22 @@ stdenv.mkDerivation { }; buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate - TimeDate gettext makeWrapper ]; + TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder ]; patchPhase = '' sed -i s@/usr/bin/perl@${perl}/bin/perl@ pm_filter mdwn2man sed -i s@/etc/ikiwiki@$out/etc@ Makefile.PL sed -i /ENV{PATH}/d ikiwiki.in + # State the gcc dependency, and make the cgi use our wrapper + sed -i -e 's@$0@"'$out/bin/ikiwiki'"@' \ + -e "s@'cc'@'${stdenv.gcc}/bin/gcc'@" IkiWiki/Wrapper.pm ''; configurePhase = "perl Makefile.PL PREFIX=$out"; postInstall = '' for a in $out/bin/*; do - wrapProgram $a --suffix PERL5LIB : $PERL5LIB --prefix PATH : ${perl}/bin:$out/bin + wrapProgram $a --suffix PERL5LIB : $PERL5LIB --prefix PATH : ${perl}/bin:$out/bin:${git}/bin done ''; |