Merge pull request #43890 from matthewbauer/mingw-fixes

Mingw fixes
This commit is contained in:
Matthew Bauer
2018-07-21 17:04:20 -04:00
committed by GitHub
10 changed files with 114 additions and 8 deletions

View File

@@ -70,7 +70,7 @@ in stdenv.mkDerivation rec {
homepage = http://xmlsoft.org/;
description = "An XML parsing library for C";
license = lib.licenses.mit;
platforms = lib.platforms.unix;
platforms = lib.platforms.all;
maintainers = [ lib.maintainers.eelco ];
};
}

View File

@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
homepage = http://xmlsoft.org/XSLT/;
description = "A C library and tools to do XSL transformations";
license = licenses.mit;
platforms = platforms.unix;
platforms = platforms.all;
maintainers = [ maintainers.eelco ];
};
}

View File

@@ -34,7 +34,11 @@ stdenv.mkDerivation rec {
] ++ lib.optional unicode "--enable-widec"
++ lib.optional enableStatic "--enable-static"
++ lib.optional (!withCxx) "--without-cxx"
++ lib.optional (abiVersion == "5") "--with-abi-version=5";
++ lib.optional (abiVersion == "5") "--with-abi-version=5"
++ lib.optionals hostPlatform.isWindows [
"--enable-sp-funcs"
"--enable-term-driver"
];
# Only the C compiler, and explicitly not C++ compiler needs this flag on solaris:
CFLAGS = lib.optionalString stdenv.isSunOS "-D_XOPEN_SOURCE_EXTENDED";

View File

@@ -44,7 +44,9 @@ let
if hostPlatform == buildPlatform
then "./config"
else if hostPlatform.isMinGW
then "./Configure mingw${toString hostPlatform.parsed.cpu.bits}"
then "./Configure mingw${optionalString
(hostPlatform.parsed.cpu.bits != 32)
(toString hostPlatform.parsed.cpu.bits)}"
else if hostPlatform.isLinux
then "./Configure linux-generic${toString hostPlatform.parsed.cpu.bits}"
else if hostPlatform.isiOS