diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-09 19:27:14 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-23 10:52:04 +0200 |
| commit | bd3d377e5eff3521de386c298c9bd89b132f2ad0 (patch) | |
| tree | 5e7324682ea25afbd60c751532991844bb16976a /pkgs/development | |
| parent | 321ecde8a163cdde9e39df277288e9ff3817f4df (diff) | |
| download | nixpkgs-bd3d377e5eff3521de386c298c9bd89b132f2ad0.tar nixpkgs-bd3d377e5eff3521de386c298c9bd89b132f2ad0.tar.gz nixpkgs-bd3d377e5eff3521de386c298c9bd89b132f2ad0.tar.bz2 nixpkgs-bd3d377e5eff3521de386c298c9bd89b132f2ad0.tar.lz nixpkgs-bd3d377e5eff3521de386c298c9bd89b132f2ad0.tar.xz nixpkgs-bd3d377e5eff3521de386c298c9bd89b132f2ad0.tar.zst nixpkgs-bd3d377e5eff3521de386c298c9bd89b132f2ad0.zip | |
freetype: fix on mingw
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/freetype/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
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. |