diff options
| -rw-r--r-- | pkgs/development/libraries/libp11/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/pam_p11/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/security/rng-tools/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
4 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/development/libraries/libp11/default.nix b/pkgs/development/libraries/libp11/default.nix index 70a433ddc28..69eb2fb6339 100644 --- a/pkgs/development/libraries/libp11/default.nix +++ b/pkgs/development/libraries/libp11/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru = { inherit openssl; }; + meta = with lib; { description = "Small layer on top of PKCS#11 API to make PKCS#11 implementations easier"; homepage = "https://github.com/OpenSC/libp11"; diff --git a/pkgs/os-specific/linux/pam_p11/default.nix b/pkgs/os-specific/linux/pam_p11/default.nix index 35199d3357b..e7537205443 100644 --- a/pkgs/os-specific/linux/pam_p11/default.nix +++ b/pkgs/os-specific/linux/pam_p11/default.nix @@ -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 { pname = "pam_p11"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ pam openssl libp11 ] + buildInputs = [ pam libp11.passthru.openssl libp11 ] ++ lib.optionals stdenv.isDarwin [ libintl ]; meta = with lib; { diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix index 6b436f0e12c..0795f843372 100644 --- a/pkgs/tools/security/rng-tools/default.nix +++ b/pkgs/tools/security/rng-tools/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.hostPlatform.isMusl [ argp-standalone ] ++ lib.optionals withJitterEntropy [ jitterentropy ] ++ lib.optionals withNistBeacon [ curl jansson libxml2 ] - ++ lib.optionals withPkcs11 [ libp11 openssl ] + ++ lib.optionals withPkcs11 [ libp11 libp11.passthru.openssl ] ++ lib.optionals withRtlsdr [ librtlsdr ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb7b2bfd548..16f73b1a4e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20770,7 +20770,9 @@ with pkgs; 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 { }; @@ -25620,9 +25622,7 @@ with pkgs; pam_mysql = callPackage ../os-specific/linux/pam_mysql { }; - pam_p11 = callPackage ../os-specific/linux/pam_p11 { - openssl = openssl_1_1; - }; + pam_p11 = callPackage ../os-specific/linux/pam_p11 { }; pam_pgsql = callPackage ../os-specific/linux/pam_pgsql { }; |