diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-03-10 12:49:37 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-03-10 12:49:37 +0000 |
| commit | 8a282aa46c1671252adc0c19ac40d453f743ff7d (patch) | |
| tree | d90e10b042b22de4661a92d0bf436f8d3fc6a180 /pkgs/development/perl-modules/BerkeleyDB | |
| parent | 93e16516a7211cf8123bfc968d9db71163381896 (diff) | |
* Set PERL5LIB automatically in the Perl setup hook.
* Remove explicit setting of PERL5LIB. * Use the generic Perl builder for the BerkeleyDB and XML::Parser modules. * Prefix all names of Perl modules with `perl-' (in the generic Perl builder). svn path=/nixpkgs/trunk/; revision=2365
Diffstat (limited to 'pkgs/development/perl-modules/BerkeleyDB')
| -rw-r--r-- | pkgs/development/perl-modules/BerkeleyDB/builder.sh | 12 | ||||
| -rw-r--r-- | pkgs/development/perl-modules/BerkeleyDB/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/development/perl-modules/BerkeleyDB/hook.sh | 7 |
3 files changed, 15 insertions, 22 deletions
diff --git a/pkgs/development/perl-modules/BerkeleyDB/builder.sh b/pkgs/development/perl-modules/BerkeleyDB/builder.sh deleted file mode 100644 index e14e8c4311ac5..0000000000000 --- a/pkgs/development/perl-modules/BerkeleyDB/builder.sh +++ /dev/null @@ -1,12 +0,0 @@ -buildinputs="$perl $db4" -. $stdenv/setup || exit 1 - -tar xvfz $src || exit 1 -cd BerkeleyDB-* || exit 1 - -echo "LIB = $db4/lib" > config.in -echo "INCLUDE = $db4/include" >> config.in - -perl Makefile.PL || exit 1 -make || exit 1 -make install SITEPREFIX=$out PERLPREFIX=$out || exit 1 diff --git a/pkgs/development/perl-modules/BerkeleyDB/default.nix b/pkgs/development/perl-modules/BerkeleyDB/default.nix index b4cf9f10438fa..0c50977f8e361 100644 --- a/pkgs/development/perl-modules/BerkeleyDB/default.nix +++ b/pkgs/development/perl-modules/BerkeleyDB/default.nix @@ -1,14 +1,12 @@ -{stdenv, fetchurl, perl, db4}: +{fetchurl, perl, db4}: -assert perl != null && db4 != null; - -stdenv.mkDerivation { - name = "perl-BerkeleyDB-0.25"; - builder = ./builder.sh; +import ../generic perl { + name = "BerkeleyDB-0.26"; src = fetchurl { - url = ftp://ftp.cs.uu.nl/mirror/CPAN/authors/id/P/PM/PMQS/BerkeleyDB-0.25.tar.gz; - md5 = "fcef06232d1ccd6c2a9cd114e388ea3d"; + url = ftp://ftp.cs.uu.nl/mirror/CPAN/authors/id/P/PM/PMQS/BerkeleyDB-0.26.tar.gz; + md5 = "6e9882f4e4bac48b24079d082af30e6c"; }; - perl = perl; - db4 = db4; + perlPreHook = ./hook.sh; + buildInputs = [db4]; +# inherit db4; } diff --git a/pkgs/development/perl-modules/BerkeleyDB/hook.sh b/pkgs/development/perl-modules/BerkeleyDB/hook.sh new file mode 100644 index 0000000000000..c0735d27e9f89 --- /dev/null +++ b/pkgs/development/perl-modules/BerkeleyDB/hook.sh @@ -0,0 +1,7 @@ +oldPreConfigure=$preConfigure +preConfigure=myPreConfigure +myPreConfigure() { + echo "LIB = $db4/lib" > config.in + echo "INCLUDE = $db4/include" >> config.in + $oldPreConfigure +} |