public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Cleanup.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30887
This commit is contained in:
Eelco Dolstra 2011-12-14 13:37:17 +00:00
parent bad4ed8717
commit adcb6d6a13
2 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/libraries/gettext/0.17.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, libiconv }: { stdenv, fetchurl, libiconv }:
stdenv.mkDerivation (rec { stdenv.mkDerivation rec {
name = "gettext-0.17"; name = "gettext-0.17";
src = fetchurl { src = fetchurl {
@ -21,6 +21,8 @@ stdenv.mkDerivation (rec {
fi fi
''; '';
buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv;
meta = { meta = {
description = "GNU gettext, a well integrated set of translation tools and documentation"; description = "GNU gettext, a well integrated set of translation tools and documentation";
@ -47,12 +49,4 @@ stdenv.mkDerivation (rec {
maintainers = [ stdenv.lib.maintainers.ludo ]; maintainers = [ stdenv.lib.maintainers.ludo ];
}; };
} }
//
(if (!stdenv.isLinux) # any non-GNU system
then {
buildInputs = [ libiconv ];
}
else {}))

16
pkgs/development/libraries/gettext/default.nix
View File

@ -1,8 +1,6 @@
# XXX: Remove me when `stdenv-updates' is merged.
{ stdenv, fetchurl, libiconv }: { stdenv, fetchurl, libiconv }:
stdenv.mkDerivation (rec { stdenv.mkDerivation rec {
name = "gettext-0.18.1.1"; name = "gettext-0.18.1.1";
src = fetchurl { src = fetchurl {
@ -23,6 +21,10 @@ stdenv.mkDerivation (rec {
fi fi
''; '';
buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv;
enableParallelBuilding = true;
crossAttrs = { crossAttrs = {
buildInputs = stdenv.lib.optional (stdenv.gccCross.libc ? libiconv) buildInputs = stdenv.lib.optional (stdenv.gccCross.libc ? libiconv)
stdenv.gccCross.libc.libiconv.hostDrv; stdenv.gccCross.libc.libiconv.hostDrv;
@ -58,11 +60,3 @@ stdenv.mkDerivation (rec {
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
}; };
} }
//
(if (!stdenv.isLinux) # any non-GNU system
then {
buildInputs = [ libiconv ];
}
else {}))