Merge pull request #236082 from vcunat/p/libssh2-openssl
This commit is contained in:
commit
ad8015ea6c
|
@ -54,7 +54,6 @@
|
|||
, lua5
|
||||
, mpeg2dec
|
||||
, ncurses
|
||||
, openssl
|
||||
, perl
|
||||
, pkg-config
|
||||
, removeReferencesTo
|
||||
|
@ -159,7 +158,6 @@ stdenv.mkDerivation rec {
|
|||
libXvMC
|
||||
xcbutilkeysyms
|
||||
])
|
||||
++ optional onlyLibVLC openssl # not sure why
|
||||
++ optional (!stdenv.hostPlatform.isAarch && !onlyLibVLC) live555
|
||||
++ optional jackSupport libjack2
|
||||
++ optionals chromecastSupport [ libmicrodns protobuf ]
|
||||
|
|
|
@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
buildInputs = [ openssl zlib ]
|
||||
propagatedBuildInputs = [ openssl ]; # see Libs: in libssh2.pc
|
||||
buildInputs = [ zlib ]
|
||||
++ lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
Loading…
Reference in a new issue