From 307924bbcc5b4f96a891f3eec776331c1b732d77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Mon, 25 Aug 2014 22:58:22 +0200 Subject: [PATCH] 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 --- pkgs/applications/graphics/synfigstudio/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index 034a147b787..ba7a916e3fe 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -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 , intltool }: @@ -42,10 +42,14 @@ stdenv.mkDerivation rec { }; 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 ]; + preBuild = '' + export FONTCONFIG_FILE=${fontsConf} + ''; + meta = with stdenv.lib; { description = "A 2D animation program"; homepage = http://www.synfig.org; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a671f50dc60..aa62043da2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9388,7 +9388,9 @@ let rake = rake; }; - synfigstudio = callPackage ../applications/graphics/synfigstudio { }; + synfigstudio = callPackage ../applications/graphics/synfigstudio { + fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; }; + }; sxhkd = callPackage ../applications/window-managers/sxhkd { };