Skip to content

eid-mw: fix build by restoring p11-kit module installation path #248103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NickCao merged 1 commit into from
Aug 13, 2023
Merged

eid-mw: fix build by restoring p11-kit module installation path #248103

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions pkgs/tools/security/eid-mw/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{ lib
, stdenv
, fetchFromGitHub
, autoreconfHook
, autoconf-archive
, pkg-config
, autoreconfHook
, makeWrapper
, pkg-config
, substituteAll
, curl
, gtk3
, libassuan
, libbsd
, libproxy
, libxml2
, nssTools
, openssl
, p11-kit
, pcsclite
, nssTools
, substituteAll
}:

stdenv.mkDerivation rec {
Expand All @@ -30,8 +30,15 @@ stdenv.mkDerivation rec {
hash = "sha256-70UjfkH+rx1Q+2XEuAByoDsP5ZelyuGXaHdkjTe/sCY=";
};

postPatch = ''
sed 's@m4_esyscmd_s(.*,@[${version}],@' -i configure.ac
substituteInPlace configure.ac --replace 'p11kitcfdir=""' 'p11kitcfdir="'$out/share/p11-kit/modules'"'
'';


nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config makeWrapper ];
buildInputs = [ curl gtk3 libassuan libbsd libproxy libxml2 openssl p11-kit pcsclite ];

preConfigure = ''
mkdir openssl
ln -s ${lib.getLib openssl}/lib openssl
Expand All @@ -44,10 +51,6 @@ stdenv.mkDerivation rec {
# pinentry uses hardcoded `/usr/bin/pinentry`, so use the built-in (uglier) dialogs for pinentry.
configureFlags = [ "--disable-pinentry" ];

postPatch = ''
sed 's@m4_esyscmd_s(.*,@[${version}],@' -i configure.ac
'';

postInstall =
let
eid-nssdb-in = substituteAll {
Expand Down