pyrox.dev
Merge pull request #229917 from helsinki-systems/p11-ossl3
pam_p11: fix against openssl_3
authored by
Martin Weinelt
and committed by
GitHub
b2744843
5a90463a
+10
-1
pkgs/os-specific/linux/pam_p11/default.nix
+10
-1
pkgs/os-specific/linux/pam_p11/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libp11, pam, libintl }:
1
+
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libp11, pam, libintl, fetchpatch }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "pam_p11";
···
10
10
rev = "pam_p11-${version}";
11
11
sha256 = "1caidy18rq5zk82d51x8vwidmkhwmanf3qm25x1yrdlbhxv6m7lk";
12
12
};
13
+
14
+
patches = [
15
+
# fix with openssl 3.x
16
+
(fetchpatch {
17
+
url = "https://github.com/OpenSC/pam_p11/pull/22.patch";
18
+
excludes = [ ".github/build.sh" ];
19
+
hash = "sha256-bm/agnBgvrr8L8yoGK4gzBqOGgsNWf9NIgcNJG7proE=";
20
+
})
21
+
];
13
22
14
23
nativeBuildInputs = [ autoreconfHook pkg-config ];
15
24
buildInputs = [ pam libp11.passthru.openssl libp11 ]
+1
-3
pkgs/top-level/all-packages.nix
+1
-3
pkgs/top-level/all-packages.nix
···
22185
22185
22186
22186
libow = callPackage ../development/libraries/libow { };
22187
22187
22188
-
libp11 = callPackage ../development/libraries/libp11 {
22189
-
openssl = openssl_1_1;
22190
-
};
22188
+
libp11 = callPackage ../development/libraries/libp11 { };
22191
22189
22192
22190
libpam-wrapper = callPackage ../development/libraries/libpam-wrapper { };
22193
22191