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

Merge pull request #276145 from mfrischknecht/fix-wolfssl-ustream-ssl

Browse Source 
ustream-ssl-wolfssl: add missing openssl dependency
This commit is contained in:
Maciej Krüger
2023-12-23 21:45:20 +01:00
committed by GitHub
parent 691d59c589 982c21722a
commit fff184fd24
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/ustream-ssl/default.nix
+10 -2
View File
@@ -1,4 +1,12 @@
{ stdenv, lib, fetchgit, cmake, pkg-config, libubox-nossl, ssl_implementation }:
{ stdenv
, lib
, fetchgit
, cmake
, pkg-config
, libubox-nossl
, ssl_implementation
, additional_buildInputs ? [ ]
}:
stdenv.mkDerivation {
pname = "ustream-ssl";
@@ -21,7 +29,7 @@ stdenv.mkDerivation {
cmakeFlags = [ "-D${lib.toUpper ssl_implementation.pname}=ON" ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ ssl_implementation ];
buildInputs = [ ssl_implementation ] ++ additional_buildInputs;
passthru = {
inherit ssl_implementation;
pkgs/top-level/all-packages.nix
+1 -1
View File
@@ -20963,7 +20963,7 @@ with pkgs;
ustream-ssl = callPackage ../development/libraries/ustream-ssl { ssl_implementation = openssl; };
ustream-ssl-wolfssl = callPackage ../development/libraries/ustream-ssl { ssl_implementation = wolfssl; };
ustream-ssl-wolfssl = callPackage ../development/libraries/ustream-ssl { ssl_implementation = wolfssl; additional_buildInputs = [ openssl ]; };
ustream-ssl-mbedtls = callPackage ../development/libraries/ustream-ssl { ssl_implementation = mbedtls_2; };