synfigstudio: fix chroot build / hydra

The error message was:
Fontconfig error: Cannot load default config file
make[2]: *** [128x128/synfig_icon.png] Segmentation fault

(cherry picked from commit 759980c4fe9b07932f671d2e657189068d117405)

Conflicts:
	pkgs/top-level/all-packages.nix
This commit is contained in:
Cillian de Róiste 2014-08-25 22:58:22 +02:00
parent 08f24b85c2
commit 307924bbcc
2 changed files with 9 additions and 3 deletions

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, boost, cairo, gettext, glibmm, gtk, gtkmm { stdenv, fetchurl, boost, cairo, fontsConf, gettext, glibmm, gtk, gtkmm
, libsigcxx, libtool, libxmlxx, pango, pkgconfig, imagemagick , libsigcxx, libtool, libxmlxx, pango, pkgconfig, imagemagick
, intltool , intltool
}: }:
@ -42,10 +42,14 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
ETL boost cairo gettext glibmm gtk gtkmm imagemagick intltool ETL boost cairo fontsConf gettext glibmm gtk gtkmm imagemagick intltool
intltool libsigcxx libtool libxmlxx pkgconfig synfig intltool libsigcxx libtool libxmlxx pkgconfig synfig
]; ];
preBuild = ''
export FONTCONFIG_FILE=${fontsConf}
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A 2D animation program"; description = "A 2D animation program";
homepage = http://www.synfig.org; homepage = http://www.synfig.org;

View File

@ -9388,7 +9388,9 @@ let
rake = rake; rake = rake;
}; };
synfigstudio = callPackage ../applications/graphics/synfigstudio { }; synfigstudio = callPackage ../applications/graphics/synfigstudio {
fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; };
};
sxhkd = callPackage ../applications/window-managers/sxhkd { }; sxhkd = callPackage ../applications/window-managers/sxhkd { };