From d0c8f68a507c0b91a38e72f276fb85f3b2e0227a Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 4 May 2023 16:51:14 +0200 Subject: [PATCH] pam_p11: fix against openssl_3 --- pkgs/os-specific/linux/pam_p11/default.nix | 11 ++++++++++- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/pam_p11/default.nix b/pkgs/os-specific/linux/pam_p11/default.nix index e7537205443e..8970f7ed6285 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, 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 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 714635a1da6e..809ad8a710ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22163,9 +22163,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 { };