summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Miller <mtmiller@ieee.org>2013-09-04 09:10:20 -0400
committerMike Miller <mtmiller@ieee.org>2013-09-04 09:10:20 -0400
commitb85ffef59d87e1b589c90d00a371e9e30348ff29 (patch)
treeb1e9ab6d0b60097784e9c3024fcf190a46163386
parentc5009b52b4f2a37c0e762ec9f9c3cdbd7eab945f (diff)
downloadhydra-recipes-b85ffef.tar.gz
octave: Add dependency on freefont_ttf and configure Fontconfig
-rw-r--r--octave/release.nix16
1 files changed, 12 insertions, 4 deletions
diff --git a/octave/release.nix b/octave/release.nix
index a259420..51f2814 100644
--- a/octave/release.nix
+++ b/octave/release.nix
@@ -36,11 +36,19 @@ let
# Optional dependencies for building native graphics on Mesa platforms.
++ (lib.optionals (lib.elem stdenv.system lib.platforms.mesaPlatforms)
- [ fltk13 fontconfig freetype mesa ]);
+ [ fltk13 fontconfig freefont_ttf freetype mesa ]);
succeedOnFailure = true;
keepBuildDirectory = true;
+ # Octave needs a working font configuration to build the manual and to
+ # run the test suite.
+ fontsConf = makeFontsConf {
+ fontDirectories = [
+ freefont_ttf
+ ];
+ };
+
jobs = rec {
tarball =
@@ -74,7 +82,7 @@ let
# Fontconfig needs a config file to build the manual.
preBuild = ''
- export FONTCONFIG_FILE="${fontconfig}/etc/fonts/fonts.conf"
+ export FONTCONFIG_FILE="${fontsConf}"
'';
};
@@ -92,7 +100,7 @@ let
# Fontconfig needs a config file to run the test suite.
preCheck = ''
- export FONTCONFIG_FILE="${fontconfig}/etc/fonts/fonts.conf"
+ export FONTCONFIG_FILE="${fontsConf}"
'';
};
@@ -108,7 +116,7 @@ let
# Fontconfig needs a config file to run the test suite.
preCheck = ''
- export FONTCONFIG_FILE="${fontconfig}/etc/fonts/fonts.conf"
+ export FONTCONFIG_FILE="${fontsConf}"
'';
};