public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

freetype: fix on mingw

Browse Source
This commit is contained in:
Vladimír Čunát 2016-02-09 19:27:14 +01:00
parent 321ecde8a1
commit bd3d377e5e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/freetype/default.nix
View File

@ -26,7 +26,8 @@ stdenv.mkDerivation rec {
}; };
patches = [] 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" (fetchbohoomil "01-freetype-2.6.2-enable-valid.patch"
"1szq0zha7n41f4pq179wgfkam034mp2xn0xc36sdl5sjp9s9hv08") "1szq0zha7n41f4pq179wgfkam034mp2xn0xc36sdl5sjp9s9hv08")
(fetchbohoomil "02-upstream-2015.12.05.patch" (fetchbohoomil "02-upstream-2015.12.05.patch"
@ -39,7 +40,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype
# dependence on harfbuzz is looser than the reverse dependence # 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. # FreeType requires GNU Make, which is not part of stdenv on FreeBSD.
++ optional (!stdenv.isLinux) gnumake; ++ optional (!stdenv.isLinux) gnumake;
@ -56,7 +57,7 @@ stdenv.mkDerivation rec {
postInstall = glib.flattenInclude; 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 # 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 # 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. # know why it's on the PATH.