From 65866dc7c2b14ebd99996d8841de445805b1ffbc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Tue, 12 Feb 2008 08:42:56 +0000 Subject: [PATCH] * Added DB_File (dbmmanage needs it). svn path=/nixpkgs/trunk/; revision=10630 --- pkgs/development/perl-modules/DB_File/default.nix | 11 +++++++++++ pkgs/development/perl-modules/DB_File/hook.sh | 11 +++++++++++ pkgs/top-level/all-packages.nix | 12 ++++++------ 3 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/perl-modules/DB_File/default.nix create mode 100644 pkgs/development/perl-modules/DB_File/hook.sh diff --git a/pkgs/development/perl-modules/DB_File/default.nix b/pkgs/development/perl-modules/DB_File/default.nix new file mode 100644 index 000000000000..6931d5d424c4 --- /dev/null +++ b/pkgs/development/perl-modules/DB_File/default.nix @@ -0,0 +1,11 @@ +{fetchurl, perl, db4}: + +import ../generic perl { + name = "DB_File-1.816"; + src = fetchurl { + url = http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/DB_File-1.816.tar.gz; + sha256 = "1a668hk5v0l180kbqss2hq9khl756cmrykn8fz1rl4qzsp6lq284"; + }; + perlPreHook = "source ${./hook.sh}"; + inherit db4; +} diff --git a/pkgs/development/perl-modules/DB_File/hook.sh b/pkgs/development/perl-modules/DB_File/hook.sh new file mode 100644 index 000000000000..033de2fd5db8 --- /dev/null +++ b/pkgs/development/perl-modules/DB_File/hook.sh @@ -0,0 +1,11 @@ +oldPreConfigure=$preConfigure +preConfigure=myPreConfigure +myPreConfigure() { + cat > config.in <<EOF +PREFIX = size_t +HASH = u_int32_t +LIB = $db4/lib +INCLUDE = $db4/include +EOF + $oldPreConfigure +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e337da8f1753..5c851443203e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -121,15 +121,11 @@ rec { useFromStdenv = hasIt: it: alternative: if hasIt then it else alternative; - lib = library; - - library = import ../lib; - # TODO remove - # lib_unstable = import ../lib/default-unstable.nix; + lib = import ../lib; # Return an attribute from the Nixpkgs configuration file, or # a default value if the attribute doesn't exist. - getConfig = attrPath: default: library.getAttr attrPath default config; + getConfig = attrPath: default: lib.getAttr attrPath default config; # Return user-choosen version of given package. If you define package as # @@ -3132,6 +3128,10 @@ rec { }; }; + perlDBFile = import ../development/perl-modules/DB_File { + inherit fetchurl perl db4; + }; + perlDigestSHA1 = import ../development/perl-modules/generic perl { name = "Digest-SHA1-2.11"; src = fetchurl {