fontconfig: split into multiple outputs

Fixed all 'fontconfig}' references as well, hopefully, ugh!
This commit is contained in:
Vladimír Čunát
2015-10-05 12:23:02 +02:00
parent 32b31398eb
commit f8c211fd2b
18 changed files with 54 additions and 45 deletions

View File

@@ -36,6 +36,8 @@ stdenv.mkDerivation rec {
})
];
outputs = [ "dev" "lib" "bin" "out" ]; # $out contains all the config
propagatedBuildInputs = [ freetype ];
buildInputs = [ pkgconfig expat ];

View File

@@ -8,9 +8,9 @@ runCommand "fonts.conf"
}
''
xsltproc --stringparam fontDirectories "$fontDirectories" \
--stringparam fontconfig "${fontconfig}" \
--stringparam fontconfig "${fontconfig.out}" \
--stringparam fontconfigConfigVersion "${fontconfig.configVersion}" \
--path ${fontconfig}/share/xml/fontconfig \
${./make-fonts-conf.xsl} ${fontconfig}/etc/fonts/fonts.conf \
--path ${fontconfig.out}/share/xml/fontconfig \
${./make-fonts-conf.xsl} ${fontconfig.out}/etc/fonts/fonts.conf \
> $out
''