eid-mw: 4.1.19 -> 4.4.1

Urgent version bump as tax season is coming and 4.1.19 is not compatible
with firefox anymore.

eid-viewer was merged upstream with eid-mw, so it is included here now.
This commit is contained in:
Bernard Fortz 2018-05-05 17:48:36 +02:00
parent 558c8a280f
commit 0c4f72c377
3 changed files with 13 additions and 48 deletions

View file

@ -1,20 +1,29 @@
{ stdenv, fetchFromGitHub
, autoreconfHook, pkgconfig
, gtk3, nssTools, pcsclite }:
, gtk3, nssTools, pcsclite
, libxml2, libproxy
, openssl, curl }:
stdenv.mkDerivation rec {
name = "eid-mw-${version}";
version = "4.3.7";
version = "4.4.1";
src = fetchFromGitHub {
sha256 = "191c74kxfrfb894v8y4vi2iygyffjy9jjq5fj7cnnddgwai5n3c5";
sha256 = "0an7xgj5rzl75kq6qfrmm886v639hhlh7c9yfs8iihc47wghpma8";
rev = "v${version}";
repo = "eid-mw";
owner = "Fedict";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ gtk3 pcsclite ];
buildInputs = [ gtk3 pcsclite libxml2 libproxy curl openssl ];
preConfigure = ''
mkdir openssl
ln -s ${openssl.out}/lib openssl
ln -s ${openssl.bin}/bin openssl
ln -s ${openssl.dev}/include openssl
export SSL_PREFIX=$(realpath openssl)
'';
postPatch = ''
sed 's@m4_esyscmd_s(.*,@[${version}],@' -i configure.ac

View file

@ -1,42 +0,0 @@
{ stdenv, fetchurl, makeWrapper, jre, pcsclite }:
stdenv.mkDerivation rec {
name = "eid-viewer-${version}";
version = "4.1.9";
src = fetchurl {
url = "https://downloads.services.belgium.be/eid/eid-viewer-${version}-v${version}.src.tar.gz";
sha256 = "0bq9jl4kl97j0dfhz4crcb1wqhn420z5vpg510zadvrmqjhy1x4g";
};
buildInputs = [ jre pcsclite ];
nativeBuildInputs = [ makeWrapper ];
unpackPhase = "tar -xzf ${src} --strip-components=1";
preConfigure = ''
substituteInPlace eid-viewer.sh.in --replace "exec java" "exec ${jre}/bin/java"
'';
postInstall = ''
wrapProgram $out/bin/eid-viewer --suffix LD_LIBRARY_PATH : ${pcsclite}/lib
cat >> $out/share/applications/eid-viewer.desktop << EOF
# eid-viewer creates XML without a header, making it "plain text":
MimeType=application/xml;text/xml;text/plain
EOF
'';
doCheck = true;
meta = with stdenv.lib; {
description = "Belgian electronic identity card (eID) viewer";
homepage = http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/;
license = licenses.lgpl3;
longDescription = ''
A simple, graphical Java application to view, print and save data from
Belgian electronic identity cards. Independent of the eid-mw package,
which is required to actually use your eID for authentication or signing.
'';
platforms = platforms.linux;
};
}

View file

@ -2108,8 +2108,6 @@ with pkgs;
eid-mw = callPackage ../tools/security/eid-mw { };
eid-viewer = callPackage ../tools/security/eid-viewer { };
mcrcon = callPackage ../tools/networking/mcrcon {};
tealdeer = callPackage ../tools/misc/tealdeer/default.nix { };