* popt updated to 1.15.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15238
This commit is contained in:
parent
ac1d4fcdc5
commit
78fbf85483
|
@ -1,9 +0,0 @@
|
|||
source $stdenv/setup
|
||||
|
||||
preConfigure() {
|
||||
autoreconf -i
|
||||
}
|
||||
|
||||
preConfigure=preConfigure
|
||||
|
||||
genericBuild
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -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];
|
||||
}
|
|
@ -3789,7 +3789,7 @@ let
|
|||
};
|
||||
|
||||
popt = import ../development/libraries/popt {
|
||||
inherit fetchurl stdenv gettext;
|
||||
inherit fetchurl stdenv;
|
||||
};
|
||||
|
||||
proj = import ../development/libraries/proj.4 {
|
||||
|
|
Loading…
Reference in New Issue