b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #229917 from helsinki-systems/p11-ossl3

Browse source 
pam_p11: fix against openssl_3
This commit is contained in:
Martin Weinelt 2023-05-12 21:20:41 +02:00 committed by GitHub
parent 5a90463a8c d0c8f68a50
commit b27448435f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/os-specific/linux/pam_p11/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libp11, pam, libintl }:
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libp11, pam, libintl, fetchpatch }:
stdenv.mkDerivation rec {
pname = "pam_p11";
@ -11,6 +11,15 @@ stdenv.mkDerivation rec {
sha256 = "1caidy18rq5zk82d51x8vwidmkhwmanf3qm25x1yrdlbhxv6m7lk";
};
patches = [
# fix with openssl 3.x
(fetchpatch {
url = "https://github.com/OpenSC/pam_p11/pull/22.patch";
excludes = [ ".github/build.sh" ];
hash = "sha256-bm/agnBgvrr8L8yoGK4gzBqOGgsNWf9NIgcNJG7proE=";
})
];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ pam libp11.passthru.openssl libp11 ]
++ lib.optionals stdenv.isDarwin [ libintl ];

4
pkgs/top-level/all-packages.nix
View file

@ -22185,9 +22185,7 @@ with pkgs;
libow = callPackage ../development/libraries/libow { };
libp11 = callPackage ../development/libraries/libp11 {
openssl = openssl_1_1;
};
libp11 = callPackage ../development/libraries/libp11 { };
libpam-wrapper = callPackage ../development/libraries/libpam-wrapper { };