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

Merge pull request #202345 from helsinki-systems/fix/pam_p11

Browse Source 
pam_p11: fix by pinning libp11 to openssl_1_1 as well
This commit is contained in:
ajs124 2022-11-25 14:42:33 +01:00 committed by GitHub
commit 482476bc1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/libp11/default.nix
View File

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

4
pkgs/os-specific/linux/pam_p11/default.nix
View File

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

2
pkgs/tools/security/rng-tools/default.nix
View File

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

8
pkgs/top-level/all-packages.nix
View File

@ -20801,7 +20801,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 { };
@ -25649,9 +25651,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 { };