libp11: build reverse dependencies with same openssl version
This commit is contained in:
parent
d300acd1cc
commit
6cb5f7bb7e
@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
passthru = { inherit openssl; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Small layer on top of PKCS#11 API to make PKCS#11 implementations easier";
|
description = "Small layer on top of PKCS#11 API to make PKCS#11 implementations easier";
|
||||||
homepage = "https://github.com/OpenSC/libp11";
|
homepage = "https://github.com/OpenSC/libp11";
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, openssl, libp11, pam, libintl }:
|
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libp11, pam, libintl }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "pam_p11";
|
pname = "pam_p11";
|
||||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||||
buildInputs = [ pam openssl libp11 ]
|
buildInputs = [ pam libp11.passthru.openssl libp11 ]
|
||||||
++ lib.optionals stdenv.isDarwin [ libintl ];
|
++ lib.optionals stdenv.isDarwin [ libintl ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
|||||||
++ lib.optionals stdenv.hostPlatform.isMusl [ argp-standalone ]
|
++ lib.optionals stdenv.hostPlatform.isMusl [ argp-standalone ]
|
||||||
++ lib.optionals withJitterEntropy [ jitterentropy ]
|
++ lib.optionals withJitterEntropy [ jitterentropy ]
|
||||||
++ lib.optionals withNistBeacon [ curl jansson libxml2 ]
|
++ lib.optionals withNistBeacon [ curl jansson libxml2 ]
|
||||||
++ lib.optionals withPkcs11 [ libp11 openssl ]
|
++ lib.optionals withPkcs11 [ libp11 libp11.passthru.openssl ]
|
||||||
++ lib.optionals withRtlsdr [ librtlsdr ];
|
++ lib.optionals withRtlsdr [ librtlsdr ];
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
@ -20770,7 +20770,9 @@ with pkgs;
|
|||||||
|
|
||||||
libow = callPackage ../development/libraries/libow { };
|
libow = callPackage ../development/libraries/libow { };
|
||||||
|
|
||||||
libp11 = callPackage ../development/libraries/libp11 { };
|
libp11 = callPackage ../development/libraries/libp11 {
|
||||||
|
openssl = openssl_1_1;
|
||||||
|
};
|
||||||
|
|
||||||
libpam-wrapper = callPackage ../development/libraries/libpam-wrapper { };
|
libpam-wrapper = callPackage ../development/libraries/libpam-wrapper { };
|
||||||
|
|
||||||
@ -25620,9 +25622,7 @@ with pkgs;
|
|||||||
|
|
||||||
pam_mysql = callPackage ../os-specific/linux/pam_mysql { };
|
pam_mysql = callPackage ../os-specific/linux/pam_mysql { };
|
||||||
|
|
||||||
pam_p11 = callPackage ../os-specific/linux/pam_p11 {
|
pam_p11 = callPackage ../os-specific/linux/pam_p11 { };
|
||||||
openssl = openssl_1_1;
|
|
||||||
};
|
|
||||||
|
|
||||||
pam_pgsql = callPackage ../os-specific/linux/pam_pgsql { };
|
pam_pgsql = callPackage ../os-specific/linux/pam_pgsql { };
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user