From ab7b06d8c953b81f400f76387a59ae513f2781e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 5 Feb 2014 08:16:33 +0100 Subject: [PATCH] fontconfig: propagate freetype as *.pc requires; maintain --- pkgs/development/libraries/fontconfig/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 478c9c9bdb9..75e28ffe748 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { } else null; - buildInputs = [ pkgconfig freetype expat ]; + propagatedBuildInputs = [ freetype ]; + buildInputs = [ pkgconfig expat ]; configureFlags = "--sysconfdir=/etc --with-cache-dir=/var/cache/fontconfig --disable-docs --with-default-fonts="; @@ -38,10 +39,11 @@ stdenv.mkDerivation rec { cd "$out/etc/fonts" && tar xvf ${infinality_patch} ''; - meta = { + meta = with stdenv.lib; { description = "A library for font customization and configuration"; homepage = http://fontconfig.org/; - license = "bsd"; - platforms = stdenv.lib.platforms.all; + license = licenses.bsd2; # custom but very bsd-like + platforms = platforms.all; + maintainers = [ maintainers.vcunat ]; }; }