Update dependencies
This commit is contained in:
parent
2570a1d661
commit
fa553e1561
9 changed files with 212 additions and 324 deletions
129
patches/122247.patch
Normal file
129
patches/122247.patch
Normal file
|
@ -0,0 +1,129 @@
|
|||
From 9865b13d73a1c01b43a039edd58e0eeba90d61e6 Mon Sep 17 00:00:00 2001
|
||||
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
|
||||
Date: Sat, 8 May 2021 23:55:56 +0200
|
||||
Subject: [PATCH 1/2] eid-mw: 4.4.27 -> 5.0.14
|
||||
|
||||
---
|
||||
pkgs/tools/security/eid-mw/default.nix | 65 +++++++++++++++-----------
|
||||
1 file changed, 38 insertions(+), 27 deletions(-)
|
||||
|
||||
diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
|
||||
index cbe56694da1421..d943274a98e9b3 100644
|
||||
--- a/pkgs/tools/security/eid-mw/default.nix
|
||||
+++ b/pkgs/tools/security/eid-mw/default.nix
|
||||
@@ -1,24 +1,36 @@
|
||||
-{ lib, stdenv, fetchFromGitHub
|
||||
-, autoreconfHook, pkg-config
|
||||
-, gtk3, nssTools, pcsclite
|
||||
-, libxml2, libproxy
|
||||
-, openssl, curl
|
||||
+{ lib
|
||||
+, stdenv
|
||||
+, fetchFromGitHub
|
||||
+, autoreconfHook
|
||||
+, autoconf-archive
|
||||
+, pkg-config
|
||||
, makeWrapper
|
||||
-, substituteAll }:
|
||||
+, curl
|
||||
+, gtk3
|
||||
+, libassuan
|
||||
+, libbsd
|
||||
+, libproxy
|
||||
+, libxml2
|
||||
+, openssl
|
||||
+, p11-kit
|
||||
+, pcsclite
|
||||
+, nssTools
|
||||
+, substituteAll
|
||||
+}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "eid-mw";
|
||||
- version = "4.4.27";
|
||||
+ version = "5.0.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
- sha256 = "17lw8iwp7h5cs3db80sysr84ffi333cf2vrhncs9l6hy6glfl2v1";
|
||||
+ sha256 = "1hyxsbxjjn9hh5p7jlcfb5yplf3n8dg49dfgi8fjp95phis3gbd4";
|
||||
repo = "eid-mw";
|
||||
owner = "Fedict";
|
||||
};
|
||||
|
||||
- nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ];
|
||||
- buildInputs = [ gtk3 pcsclite libxml2 libproxy curl openssl ];
|
||||
+ nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config makeWrapper ];
|
||||
+ buildInputs = [ curl gtk3 libassuan libbsd libproxy libxml2 openssl p11-kit pcsclite ];
|
||||
preConfigure = ''
|
||||
mkdir openssl
|
||||
ln -s ${openssl.out}/lib openssl
|
||||
@@ -27,30 +39,29 @@ stdenv.mkDerivation rec {
|
||||
export SSL_PREFIX=$(realpath openssl)
|
||||
substituteInPlace plugins_tools/eid-viewer/Makefile.in \
|
||||
--replace "c_rehash" "openssl rehash"
|
||||
- '';
|
||||
+ '';
|
||||
+ configureFlags = [ "--disable-pinentry" ];
|
||||
|
||||
postPatch = ''
|
||||
sed 's@m4_esyscmd_s(.*,@[${version}],@' -i configure.ac
|
||||
'';
|
||||
|
||||
- configureFlags = [ "--enable-dialogs=yes" ];
|
||||
-
|
||||
postInstall =
|
||||
- let
|
||||
- eid-nssdb-in = substituteAll {
|
||||
- inherit (stdenv) shell;
|
||||
- isExecutable = true;
|
||||
- src = ./eid-nssdb.in;
|
||||
- };
|
||||
- in
|
||||
- ''
|
||||
- install -D ${eid-nssdb-in} $out/bin/eid-nssdb
|
||||
- substituteInPlace $out/bin/eid-nssdb \
|
||||
- --replace "modutil" "${nssTools}/bin/modutil"
|
||||
+ let
|
||||
+ eid-nssdb-in = substituteAll {
|
||||
+ inherit (stdenv) shell;
|
||||
+ isExecutable = true;
|
||||
+ src = ./eid-nssdb.in;
|
||||
+ };
|
||||
+ in
|
||||
+ ''
|
||||
+ install -D ${eid-nssdb-in} $out/bin/eid-nssdb
|
||||
+ substituteInPlace $out/bin/eid-nssdb \
|
||||
+ --replace "modutil" "${nssTools}/bin/modutil"
|
||||
|
||||
- rm $out/bin/about-eid-mw
|
||||
- wrapProgram $out/bin/eid-viewer --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/$name"
|
||||
- '';
|
||||
+ rm $out/bin/about-eid-mw
|
||||
+ wrapProgram $out/bin/eid-viewer --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/$name"
|
||||
+ '';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
From c6b73cfad86428d2fca84c2064a03e4dd48b8c46 Mon Sep 17 00:00:00 2001
|
||||
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
|
||||
Date: Sat, 8 May 2021 23:56:10 +0200
|
||||
Subject: [PATCH 2/2] eid-mw: add chvp as maintainer
|
||||
|
||||
---
|
||||
pkgs/tools/security/eid-mw/default.nix | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
|
||||
index d943274a98e9b3..a104112265730f 100644
|
||||
--- a/pkgs/tools/security/eid-mw/default.nix
|
||||
+++ b/pkgs/tools/security/eid-mw/default.nix
|
||||
@@ -94,6 +94,6 @@ stdenv.mkDerivation rec {
|
||||
firefox.override { pkcs11Modules = [ pkgs.eid-mw ]; }
|
||||
'';
|
||||
platforms = platforms.linux;
|
||||
- maintainers = with maintainers; [ bfortz ];
|
||||
+ maintainers = with maintainers; [ bfortz chvp ];
|
||||
};
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue