* popt updated to 1.15.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15238
This commit is contained in:
Eelco Dolstra 2009-04-22 07:16:45 +00:00
parent ac1d4fcdc5
commit 78fbf85483
4 changed files with 11 additions and 26 deletions

View File

@ -1,9 +0,0 @@
source $stdenv/setup
preConfigure() {
autoreconf -i
}
preConfigure=preConfigure
genericBuild

View File

@ -1 +1,10 @@
import ./popt-1.7.nix
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "popt-1.15";
src = fetchurl {
url = http://rpm5.org/files/popt/popt-1.15.tar.gz;
sha256 = "1wqbcimg4zlfp7261i89s1918a46fjfbvq1a4ij4a6prk27576q6";
};
}

View File

@ -1,15 +0,0 @@
{stdenv, fetchurl, gettext}:
assert gettext != null;
stdenv.mkDerivation {
name = "popt-1.7";
src = fetchurl {
urls = [
ftp://distro.ibiblio.org/pub/linux/distributions/pdaxrom/src/popt-1.7.tar.gz
http://nixos.org/tarballs/popt-1.7.tar.gz
];
md5 = "5988e7aeb0ae4dac8d83561265984cc9";
};
buildInputs = [gettext];
}

View File

@ -3789,7 +3789,7 @@ let
};
popt = import ../development/libraries/popt {
inherit fetchurl stdenv gettext;
inherit fetchurl stdenv;
};
proj = import ../development/libraries/proj.4 {