mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-18 19:51:17 +00:00
* Fontconfig updated to 2.7.3. Use /etc/fonts as the default
configuration directory so that users on other distributions don't need to set $FONTCONFIG_FILE (NIXPKGS-29). Also use /var/cache/fontconfig for the cache to prevent programs run by root from writing into the Nix store. svn path=/nixpkgs/branches/xorg-7.5/; revision=18021
This commit is contained in:
parent
1b25d01703
commit
9301524c50
12
doc/meta.xml
12
doc/meta.xml
|
@ -164,6 +164,18 @@ following:
|
|||
3 or higher.</para></listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><varname>bsd</varname></term>
|
||||
<listitem><para>Catch-all for licenses that are essentially
|
||||
similar to <link
|
||||
xlink:href="http://www.gnu.org/licenses/license-list.html#ModifiedBSD">the
|
||||
original BSD license with the advertising clause removed</link>,
|
||||
i.e. permissive non-copyleft free software licenses. This
|
||||
includes the <link
|
||||
xlink:href="http://www.gnu.org/licenses/license-list.html#X11License">X11
|
||||
(“MIT”) License</link>.</para></listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><varname>free</varname></term>
|
||||
<listitem><para>Catch-all for free software licenses not listed
|
||||
|
|
|
@ -1,22 +1,23 @@
|
|||
{stdenv, fetchurl, freetype, expat}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "fontconfig-2.6.0";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "fontconfig-2.7.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://fontconfig.org/release/fontconfig-2.6.0.tar.gz;
|
||||
sha256 = "19fqr2vh7rzpqfh2lnkymh7q5pxn9r4w2z35lh36crp5l3m3k9m9";
|
||||
url = "http://fontconfig.org/release/${name}.tar.gz";
|
||||
sha256 = "0l5hjifapv4v88a204ixg6w6xly81cji2cr65znra0vbbkqvz3xs";
|
||||
};
|
||||
|
||||
buildInputs = [freetype];
|
||||
propagatedBuildInputs = [expat]; # !!! shouldn't be necessary, but otherwise pango breaks
|
||||
|
||||
preConfigure = ''
|
||||
configureFlags="--with-confdir=$out/etc/fonts --disable-docs --with-default-fonts="
|
||||
'';
|
||||
configureFlags = "--with-confdir=/etc/fonts --with-cache-dir=/var/cache/fontconfig --disable-docs --with-default-fonts=";
|
||||
|
||||
installFlags = "CONFDIR=$(out)/etc RUN_FC_CACHE_TEST=false";
|
||||
|
||||
meta = {
|
||||
description = "A library for font customization and configuration";
|
||||
homepage = http://fontconfig.org/;
|
||||
license = "bsd";
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue