From bd3d377e5eff3521de386c298c9bd89b132f2ad0 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Tue, 9 Feb 2016 19:27:14 +0100 Subject: freetype: fix on mingw --- pkgs/development/libraries/freetype/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 81e98056e90..0548d1433b7 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -26,7 +26,8 @@ stdenv.mkDerivation rec { }; patches = [] - ++ optionals useEncumberedCode [ + # mingw: these patches use `strcasestr` which isn't available on windows + ++ optionals (useEncumberedCode && stdenv.cross.libc or null != "msvcrt" ) [ (fetchbohoomil "01-freetype-2.6.2-enable-valid.patch" "1szq0zha7n41f4pq179wgfkam034mp2xn0xc36sdl5sjp9s9hv08") (fetchbohoomil "02-upstream-2015.12.05.patch" @@ -39,7 +40,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype # dependence on harfbuzz is looser than the reverse dependence - buildInputs = [ pkgconfig which ] + nativeBuildInputs = [ pkgconfig which ] # FreeType requires GNU Make, which is not part of stdenv on FreeBSD. ++ optional (!stdenv.isLinux) gnumake; @@ -56,7 +57,7 @@ stdenv.mkDerivation rec { postInstall = glib.flattenInclude; - crossAttrs = { + crossAttrs = stdenv.lib.optionalAttrs (stdenv.cross.libc or null != "msvcrt") { # Somehow it calls the unwrapped gcc, "i686-pc-linux-gnu-gcc", instead # of gcc. I think it's due to the unwrapped gcc being in the PATH. I don't # know why it's on the PATH. -- cgit 1.4.1