diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-07-21 17:04:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 17:04:20 -0400 |
| commit | 916f096911162ea4c85f3fb2eed5af8785abf925 (patch) | |
| tree | 6d1a37cd15afb34dff9cb416ea99a39392ad513d /pkgs/development/libraries | |
| parent | e975814b19ba8cb8052a60f18de2ee4aebe1190b (diff) | |
| parent | b98b4eac71cfb0ccedc6d909fd58058bc1cb85e7 (diff) | |
| download | nixlib-916f096911162ea4c85f3fb2eed5af8785abf925.tar nixlib-916f096911162ea4c85f3fb2eed5af8785abf925.tar.gz nixlib-916f096911162ea4c85f3fb2eed5af8785abf925.tar.bz2 nixlib-916f096911162ea4c85f3fb2eed5af8785abf925.tar.lz nixlib-916f096911162ea4c85f3fb2eed5af8785abf925.tar.xz nixlib-916f096911162ea4c85f3fb2eed5af8785abf925.tar.zst nixlib-916f096911162ea4c85f3fb2eed5af8785abf925.zip | |
Merge pull request #43890 from matthewbauer/mingw-fixes
Mingw fixes
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/libxml2/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/libxslt/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/ncurses/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/openssl/default.nix | 4 |
4 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 51c142a81119..b28f241d56ee 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -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 ]; }; } diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 5b6fdb462c2c..4dfdea582a25 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -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 ]; }; } diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index cf478837b86d..042c09fd8644 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -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"; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index b4b932f8d058..b5b9ae766465 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -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 |