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

Made ikiwiki work at least using 'git'. I tested the CGI this time.

Browse Source 
I had to add some perl modules again.

svn path=/nixpkgs/trunk/; revision=17838
This commit is contained in:
Lluís Batlle i Rossell 2009-10-15 22:08:35 +00:00
parent ffe3d65986
commit 54a04a789a
3 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,7 @@
{stdenv, fetchurl, perl, gettext, makeWrapper, {stdenv, fetchurl, perl, gettext, makeWrapper,
TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate}: TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate,
CGISession, CGIFormBuilder, DBFile,
git}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ikiwiki_3.20091009"; name = "ikiwiki_3.20091009";
@ -10,19 +12,22 @@ stdenv.mkDerivation {
}; };
buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
TimeDate gettext makeWrapper ]; TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder ];
patchPhase = '' patchPhase = ''
sed -i s@/usr/bin/perl@${perl}/bin/perl@ pm_filter mdwn2man sed -i s@/usr/bin/perl@${perl}/bin/perl@ pm_filter mdwn2man
sed -i s@/etc/ikiwiki@$out/etc@ Makefile.PL sed -i s@/etc/ikiwiki@$out/etc@ Makefile.PL
sed -i /ENV{PATH}/d ikiwiki.in 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"; configurePhase = "perl Makefile.PL PREFIX=$out";
postInstall = '' postInstall = ''
for a in $out/bin/*; do 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 done
''; '';

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

@ -7130,7 +7130,8 @@ let
ikiwiki = import ../applications/misc/ikiwiki { ikiwiki = import ../applications/misc/ikiwiki {
inherit fetchurl stdenv perl gettext makeWrapper; inherit fetchurl stdenv perl gettext makeWrapper;
inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate TimeDate; inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder;
inherit git; # The RCS should be optional
}; };
imagemagick = import ../applications/graphics/ImageMagick { imagemagick = import ../applications/graphics/ImageMagick {

17
pkgs/top-level/perl-packages.nix
View File

@ -453,14 +453,23 @@ rec {
}; };
}; };
CGISession = buildPerlPackage { CGIFormBuilder = buildPerlPackage rec {
name = "CGI-Session-3.95"; name = "CGI-FormBuilder-3.0501";
src = fetchurl { src = fetchurl {
url = mirror://cpan/authors/id/S/SH/SHERZODR/CGI-Session-3.95.tar.gz; url = "mirror://cpan/authors/id/N/NW/NWIGER/${name}.tgz";
md5 = "fe9e46496c7c711c54ca13209ded500b"; sha256 = "031sgxifl2dq8d4s4d9vnixvqdd3p952k0jrkyqp823k74glps25";
}; };
}; };
CGISession = buildPerlPackage rec {
name = "CGI-Session-4.42";
src = fetchurl {
url = "mirror://cpan/authors/id/M/MA/MARKSTOS/${name}.tar.gz";
sha256 = "186lqqmfvisw3i74anvnsaqlbp6ww3wyhlsgdpni0mlcnh56h4gw";
};
buildInputs = [ DBFile ];
};
CGISimple = buildPerlPackage { CGISimple = buildPerlPackage {
name = "CGI-Simple-1.106"; name = "CGI-Simple-1.106";
src = fetchurl { src = fetchurl {