diff options
Diffstat (limited to 'pkgs/development/perl-modules')
-rw-r--r--[-rwxr-xr-x] | pkgs/development/perl-modules/BerkeleyDB/builder.sh | 2 | ||||
-rw-r--r-- | pkgs/development/perl-modules/BerkeleyDB/default.nix | 4 | ||||
-rw-r--r--[-rwxr-xr-x] | pkgs/development/perl-modules/XML-Parser/builder.sh | 2 | ||||
-rw-r--r-- | pkgs/development/perl-modules/XML-Parser/default.nix | 4 |
4 files changed, 2 insertions, 10 deletions
diff --git a/pkgs/development/perl-modules/BerkeleyDB/builder.sh b/pkgs/development/perl-modules/BerkeleyDB/builder.sh index ebe916c738e8d..e14e8c4311ac5 100755..100644 --- a/pkgs/development/perl-modules/BerkeleyDB/builder.sh +++ b/pkgs/development/perl-modules/BerkeleyDB/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - buildinputs="$perl $db4" . $stdenv/setup || exit 1 diff --git a/pkgs/development/perl-modules/BerkeleyDB/default.nix b/pkgs/development/perl-modules/BerkeleyDB/default.nix index 8dd44e1e201ca..b4cf9f10438fa 100644 --- a/pkgs/development/perl-modules/BerkeleyDB/default.nix +++ b/pkgs/development/perl-modules/BerkeleyDB/default.nix @@ -2,15 +2,13 @@ assert perl != null && db4 != null; -derivation { +stdenv.mkDerivation { name = "perl-BerkeleyDB-0.25"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = ftp://ftp.cs.uu.nl/mirror/CPAN/authors/id/P/PM/PMQS/BerkeleyDB-0.25.tar.gz; md5 = "fcef06232d1ccd6c2a9cd114e388ea3d"; }; - stdenv = stdenv; perl = perl; db4 = db4; } diff --git a/pkgs/development/perl-modules/XML-Parser/builder.sh b/pkgs/development/perl-modules/XML-Parser/builder.sh index 3b5d98eebba05..b6409cd87651b 100755..100644 --- a/pkgs/development/perl-modules/XML-Parser/builder.sh +++ b/pkgs/development/perl-modules/XML-Parser/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - buildinputs="$perl $expat" . $stdenv/setup || exit 1 diff --git a/pkgs/development/perl-modules/XML-Parser/default.nix b/pkgs/development/perl-modules/XML-Parser/default.nix index 79bad03171eca..3f41b6327035c 100644 --- a/pkgs/development/perl-modules/XML-Parser/default.nix +++ b/pkgs/development/perl-modules/XML-Parser/default.nix @@ -2,15 +2,13 @@ assert perl != null && expat != null; -derivation { +stdenv.mkDerivation { name = "perl-XML-Parser-2.34"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://search.cpan.org/CPAN/authors/id/M/MS/MSERGEANT/XML-Parser-2.34.tar.gz; md5 = "84d9e0001fe01c14867256c3fe115899"; }; - stdenv = stdenv; perl = perl; expat = expat; } |