* Cleanup.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30887
This commit is contained in:
parent
bad4ed8717
commit
adcb6d6a13
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchurl, libiconv }:
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gettext-0.17";
|
||||
|
||||
src = fetchurl {
|
||||
@ -21,6 +21,8 @@ stdenv.mkDerivation (rec {
|
||||
fi
|
||||
'';
|
||||
|
||||
buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv;
|
||||
|
||||
meta = {
|
||||
description = "GNU gettext, a well integrated set of translation tools and documentation";
|
||||
|
||||
@ -47,12 +49,4 @@ stdenv.mkDerivation (rec {
|
||||
|
||||
maintainers = [ stdenv.lib.maintainers.ludo ];
|
||||
};
|
||||
}
|
||||
|
||||
//
|
||||
|
||||
(if (!stdenv.isLinux) # any non-GNU system
|
||||
then {
|
||||
buildInputs = [ libiconv ];
|
||||
}
|
||||
else {}))
|
||||
}
|
@ -1,8 +1,6 @@
|
||||
# XXX: Remove me when `stdenv-updates' is merged.
|
||||
|
||||
{ stdenv, fetchurl, libiconv }:
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gettext-0.18.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
@ -23,6 +21,10 @@ stdenv.mkDerivation (rec {
|
||||
fi
|
||||
'';
|
||||
|
||||
buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
crossAttrs = {
|
||||
buildInputs = stdenv.lib.optional (stdenv.gccCross.libc ? libiconv)
|
||||
stdenv.gccCross.libc.libiconv.hostDrv;
|
||||
@ -58,11 +60,3 @@ stdenv.mkDerivation (rec {
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
//
|
||||
|
||||
(if (!stdenv.isLinux) # any non-GNU system
|
||||
then {
|
||||
buildInputs = [ libiconv ];
|
||||
}
|
||||
else {}))
|
||||
|
Loading…
Reference in New Issue
Block a user