gettext: using selectVersion
svn path=/nixpkgs/branches/stdenv-updates/; revision=10453
This commit is contained in:
parent
b7ff9b6d22
commit
45b91c969c
@ -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) ]
|
|
||||||
]
|
|
@ -1929,12 +1929,12 @@ rec {
|
|||||||
# python / ruby support
|
# python / ruby support
|
||||||
};
|
};
|
||||||
|
|
||||||
gettext = getVersion "gettext" gettext_alts;
|
gettextFun = lib.sumArgs (selectVersion ../development/libraries/gettext "0.16.x") {
|
||||||
|
|
||||||
gettext_alts = import ../development/libraries/gettext {
|
|
||||||
inherit fetchurl stdenv;
|
inherit fetchurl stdenv;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
gettext = gettextFun null;
|
||||||
|
|
||||||
gd = import ../development/libraries/gd {
|
gd = import ../development/libraries/gd {
|
||||||
inherit fetchurl stdenv zlib libpng freetype libjpeg fontconfig;
|
inherit fetchurl stdenv zlib libpng freetype libjpeg fontconfig;
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user