colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #236082 from vcunat/p/libssh2-openssl

Browse Source
This commit is contained in:
Sandro 2023-06-06 14:11:17 +02:00 committed by GitHub
commit ad8015ea6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/video/vlc/default.nix
View File

@ -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 ]

3
pkgs/development/libraries/libssh2/default.nix
View File

@ -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; {