diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 13:10:39 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 13:14:14 -0400 |
| commit | 2b28312bc2146e6a2729cd46ae79ab666d3c6521 (patch) | |
| tree | 2025b0e527cce20201125a36548937fa3ec10da2 /pkgs/development/libraries/libssh2 | |
| parent | 7afe4f1df070f0f63fd1bc1158109dbc8fe3dfef (diff) | |
| download | nixpkgs-2b28312bc2146e6a2729cd46ae79ab666d3c6521.tar nixpkgs-2b28312bc2146e6a2729cd46ae79ab666d3c6521.tar.gz nixpkgs-2b28312bc2146e6a2729cd46ae79ab666d3c6521.tar.bz2 nixpkgs-2b28312bc2146e6a2729cd46ae79ab666d3c6521.tar.lz nixpkgs-2b28312bc2146e6a2729cd46ae79ab666d3c6521.tar.xz nixpkgs-2b28312bc2146e6a2729cd46ae79ab666d3c6521.tar.zst nixpkgs-2b28312bc2146e6a2729cd46ae79ab666d3c6521.zip | |
libssh2: Remove crossAttrs
- --with-<lib> stuff isn't needed with new default - `mingw_w64` probably also isn't needed, but kept with better code just in case.
Diffstat (limited to 'pkgs/development/libraries/libssh2')
| -rw-r--r-- | pkgs/development/libraries/libssh2/default.nix | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index a09a7670739..f85b709cf39 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"; |