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

eid-mw: 4.4.27 -> 5.0.21 (#122247)

Browse source
This commit is contained in:
Charlotte Van Petegem 2021-05-22 15:47:53 +02:00 committed by GitHub
parent ca0f0212c2
commit f29969988d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 41 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
pkgs/tools/security/eid-mw/default.nix
View file

@ -1,24 +1,37 @@
{ lib, stdenv, fetchFromGitHub { lib
, autoreconfHook, pkg-config , stdenv
, gtk3, nssTools, pcsclite , fetchFromGitHub
, libxml2, libproxy , autoreconfHook
, openssl, curl , autoconf-archive
, pkg-config
, makeWrapper , makeWrapper
, substituteAll }: , curl
, gtk3
, libassuan
, libbsd
, libproxy
, libxml2
, openssl
, p11-kit
, pcsclite
, nssTools
, substituteAll
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "eid-mw"; pname = "eid-mw";
version = "4.4.27"; # NOTE: Don't just blindly update to the latest version/tag. Releases are always for a specific OS.
version = "5.0.21";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "v${version}"; rev = "v${version}";
sha256 = "17lw8iwp7h5cs3db80sysr84ffi333cf2vrhncs9l6hy6glfl2v1"; sha256 = "1sz7996q6gd6vbdxqgyx1jwjznpki1k9zbgaj1j1a51y6w0g0kdh";
repo = "eid-mw"; repo = "eid-mw";
owner = "Fedict"; owner = "Fedict";
}; };
nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ]; nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config makeWrapper ];
buildInputs = [ gtk3 pcsclite libxml2 libproxy curl openssl ]; buildInputs = [ curl gtk3 libassuan libbsd libproxy libxml2 openssl p11-kit pcsclite ];
preConfigure = '' preConfigure = ''
mkdir openssl mkdir openssl
ln -s ${openssl.out}/lib openssl ln -s ${openssl.out}/lib openssl
@ -27,30 +40,30 @@ stdenv.mkDerivation rec {
export SSL_PREFIX=$(realpath openssl) export SSL_PREFIX=$(realpath openssl)
substituteInPlace plugins_tools/eid-viewer/Makefile.in \ substituteInPlace plugins_tools/eid-viewer/Makefile.in \
--replace "c_rehash" "openssl rehash" --replace "c_rehash" "openssl rehash"
''; '';
# pinentry uses hardcoded `/usr/bin/pinentry`, so use the built-in (uglier) dialogs for pinentry.
configureFlags = [ "--disable-pinentry" ];
postPatch = '' postPatch = ''
sed 's@m4_esyscmd_s(.*,@[${version}],@' -i configure.ac sed 's@m4_esyscmd_s(.*,@[${version}],@' -i configure.ac
''; '';
configureFlags = [ "--enable-dialogs=yes" ];
postInstall = postInstall =
let let
eid-nssdb-in = substituteAll { eid-nssdb-in = substituteAll {
inherit (stdenv) shell; inherit (stdenv) shell;
isExecutable = true; isExecutable = true;
src = ./eid-nssdb.in; src = ./eid-nssdb.in;
}; };
in in
'' ''
install -D ${eid-nssdb-in} $out/bin/eid-nssdb install -D ${eid-nssdb-in} $out/bin/eid-nssdb
substituteInPlace $out/bin/eid-nssdb \ substituteInPlace $out/bin/eid-nssdb \
--replace "modutil" "${nssTools}/bin/modutil" --replace "modutil" "${nssTools}/bin/modutil"
rm $out/bin/about-eid-mw rm $out/bin/about-eid-mw
wrapProgram $out/bin/eid-viewer --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/$name" wrapProgram $out/bin/eid-viewer --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/$name"
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;
@ -83,6 +96,6 @@ stdenv.mkDerivation rec {
firefox.override { pkcs11Modules = [ pkgs.eid-mw ]; } firefox.override { pkcs11Modules = [ pkgs.eid-mw ]; }
''; '';
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ bfortz ]; maintainers = with maintainers; [ bfortz chvp ];
}; };
} }