diff options
| author | Mathijs Kwik <mathijs@bluescreen303.nl> | 2014-09-22 19:01:57 +0200 |
|---|---|---|
| committer | Mathijs Kwik <mathijs@bluescreen303.nl> | 2014-09-23 09:17:02 +0200 |
| commit | eb1ed09b1d13a23bff31dcfc5aa4bb5d4e0b9d75 (patch) | |
| tree | d9d7bf3c42fe19ad4d8e0622764acd55c6437bb6 /pkgs | |
| parent | e80cbedbae7c9c5be35ec01ab668bb8ca9d5a0b5 (diff) | |
| download | nixpkgs-eb1ed09b1d13a23bff31dcfc5aa4bb5d4e0b9d75.tar nixpkgs-eb1ed09b1d13a23bff31dcfc5aa4bb5d4e0b9d75.tar.gz nixpkgs-eb1ed09b1d13a23bff31dcfc5aa4bb5d4e0b9d75.tar.bz2 nixpkgs-eb1ed09b1d13a23bff31dcfc5aa4bb5d4e0b9d75.tar.lz nixpkgs-eb1ed09b1d13a23bff31dcfc5aa4bb5d4e0b9d75.tar.xz nixpkgs-eb1ed09b1d13a23bff31dcfc5aa4bb5d4e0b9d75.tar.zst nixpkgs-eb1ed09b1d13a23bff31dcfc5aa4bb5d4e0b9d75.zip | |
neoload: provide fake fontconfig file (fixes chroot builds)
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/neoload/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/development/tools/neoload/default.nix b/pkgs/development/tools/neoload/default.nix index 5b66ea75f65..fc9446408de 100644 --- a/pkgs/development/tools/neoload/default.nix +++ b/pkgs/development/tools/neoload/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, writeTextFile, jre, makeWrapper, licenseAccepted ? false }: +{ stdenv, fetchurl, writeTextFile, jre, makeWrapper, fontsConf, licenseAccepted ? false }: # If you happen to use this software on the XMonad window manager, you will have issues with # grey windows, no resizing, menus not showing and other glitches. @@ -62,6 +62,7 @@ in stdenv.mkDerivation rec { export HOME=`pwd` export INSTALL4J_JAVA_HOME=${jre} + export FONTCONFIG_FILE=${fontsConf} bash -ic './installer -q -varfile response.varfile' sed -i 's/Xmx450m/Xmx900m/;s/Xss192k/Xss384k/' $out/lib/neoload/conf/agent.properties diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b380653ae5e..fce0b55a92d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4334,6 +4334,11 @@ let neoload = callPackage ../development/tools/neoload { licenseAccepted = (config.neoload.accept_license or false); + fontsConf = makeFontsConf { + fontDirectories = [ + xorg.fontbhttf + ]; + }; }; ninja = callPackage ../development/tools/build-managers/ninja { }; |