* Fix indentation mess-up in r9931.
svn path=/nixpkgs/trunk/; revision=9973
This commit is contained in:
parent
fa35a029ed
commit
2da5646a4e
@ -1266,7 +1266,6 @@ rec {
|
|||||||
flags = [ "mysql" "mysqli" "pdo_mysql" "libxml2" "apxs2" ];
|
flags = [ "mysql" "mysqli" "pdo_mysql" "libxml2" "apxs2" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
python = getVersion "python" python_alts;
|
python = getVersion "python" python_alts;
|
||||||
|
|
||||||
python_alts = import ../development/interpreters/python {
|
python_alts = import ../development/interpreters/python {
|
||||||
@ -3581,10 +3580,6 @@ xorg_sys_opengl = import ../os-specific/linux/opengl/xorg-sys {
|
|||||||
|
|
||||||
### DATA
|
### DATA
|
||||||
|
|
||||||
wrapFonts = paths : ((import ../data/fonts/fontWrap) {
|
|
||||||
inherit fetchurl stdenv builderDefs paths;
|
|
||||||
inherit (xorg) mkfontdir mkfontscale;
|
|
||||||
});
|
|
||||||
|
|
||||||
bakoma_ttf = import ../data/fonts/bakoma-ttf {
|
bakoma_ttf = import ../data/fonts/bakoma-ttf {
|
||||||
inherit fetchurl stdenv;
|
inherit fetchurl stdenv;
|
||||||
@ -3594,6 +3589,11 @@ corefonts = import ../data/fonts/corefonts {
|
|||||||
inherit fetchurl stdenv cabextract;
|
inherit fetchurl stdenv cabextract;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
wrapFonts = paths : ((import ../data/fonts/fontWrap) {
|
||||||
|
inherit fetchurl stdenv builderDefs paths;
|
||||||
|
inherit (xorg) mkfontdir mkfontscale;
|
||||||
|
});
|
||||||
|
|
||||||
docbook5 = import ../data/sgml+xml/schemas/docbook-5.0 {
|
docbook5 = import ../data/sgml+xml/schemas/docbook-5.0 {
|
||||||
inherit fetchurl stdenv;
|
inherit fetchurl stdenv;
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user