From 36e2e9dd3383c42c60f20e026a51d127d7e299dc Mon Sep 17 00:00:00 2001 From: eburimu Date: Tue, 20 Nov 2018 21:19:48 -0600 Subject: [PATCH] fontconfig: use native xsltproc in case of cross compilation Fixes #50801 --- pkgs/development/libraries/fontconfig/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 1a028526726c..f730e3e3408f 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config propagatedBuildInputs = [ freetype ]; - nativeBuildInputs = [ pkgconfig gperf ]; + nativeBuildInputs = [ pkgconfig gperf libxslt ]; buildInputs = [ expat ]; configureFlags = [ @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { postInstall = '' cd "$out/etc/fonts" - "${libxslt.bin}/bin/xsltproc" --stringparam fontDirectories "${dejavu_fonts.minimal}" \ + xsltproc --stringparam fontDirectories "${dejavu_fonts.minimal}" \ --stringparam fontconfigConfigVersion "${configVersion}" \ --path $out/share/xml/fontconfig \ ${./make-fonts-conf.xsl} $out/etc/fonts/fonts.conf \ @@ -77,4 +77,3 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.vcunat ]; }; } -