From 2b28312bc2146e6a2729cd46ae79ab666d3c6521 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 10 May 2018 13:10:39 -0400 Subject: [PATCH] libssh2: Remove crossAttrs - --with- stuff isn't needed with new default - `mingw_w64` probably also isn't needed, but kept with better code just in case. --- pkgs/development/libraries/libssh2/default.nix | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index a09a76707390..f85b709cf397 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -12,22 +12,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; - buildInputs = [ openssl zlib ]; - - crossAttrs = { - # link against cross-built libraries - configureFlags = [ - "--with-openssl" - "--with-libssl-prefix=${openssl.crossDrv}" - "--with-libz" - "--with-libz-prefix=${zlib.crossDrv}" - ]; - } // stdenv.lib.optionalAttrs (hostPlatform.libc == "msvcrt") { - # mingw needs import library of ws2_32 to build the shared library - preConfigure = '' - export LDFLAGS="-L${windows.mingw_w64}/lib $LDFLAGS" - ''; - }; + buildInputs = [ openssl zlib ] + ++ stdenv.lib.optional hostPlatform.isMinGW windows.mingw_w64; meta = { description = "A client-side C library implementing the SSH2 protocol";