gettext: using selectVersion

svn path=/nixpkgs/branches/stdenv-updates/; revision=10453
This commit is contained in:
Yury G. Kudryashov 2008-02-02 20:39:12 +00:00
parent b7ff9b6d22
commit 45b91c969c
2 changed files with 3 additions and 11 deletions

View File

@ -1,8 +0,0 @@
args:
args.stdenv.lib.listOfListsToAttrs [
[ "recurseForDerivations" true ]
[ "0.14.6" (import ./0.14.6.nix args) ]
[ "0.15" (import ./0.15.nix args) ]
[ "0.16.x" (import ./0.16.x.nix args) ]
[ "default" (import ./0.16.x.nix args) ]
]

View File

@ -1929,12 +1929,12 @@ rec {
# python / ruby support
};
gettext = getVersion "gettext" gettext_alts;
gettext_alts = import ../development/libraries/gettext {
gettextFun = lib.sumArgs (selectVersion ../development/libraries/gettext "0.16.x") {
inherit fetchurl stdenv;
};
gettext = gettextFun null;
gd = import ../development/libraries/gd {
inherit fetchurl stdenv zlib libpng freetype libjpeg fontconfig;
};