diff options
| author | Florian Klink <flokli@flokli.de> | 2022-06-03 20:07:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-03 20:07:38 +0200 |
| commit | 06db264780d182bc1dd86212a240a7104af6cd3c (patch) | |
| tree | eac066d1da6ceca527baea60fad55f8b60cab499 | |
| parent | 30c3cc499d4715b050de8f4a39dbf4b8edde7e5c (diff) | |
| parent | 11c7d480161716db3e880fe69b2a564ada07ea4a (diff) | |
| download | nixpkgs-06db264780d182bc1dd86212a240a7104af6cd3c.tar nixpkgs-06db264780d182bc1dd86212a240a7104af6cd3c.tar.gz nixpkgs-06db264780d182bc1dd86212a240a7104af6cd3c.tar.bz2 nixpkgs-06db264780d182bc1dd86212a240a7104af6cd3c.tar.lz nixpkgs-06db264780d182bc1dd86212a240a7104af6cd3c.tar.xz nixpkgs-06db264780d182bc1dd86212a240a7104af6cd3c.tar.zst nixpkgs-06db264780d182bc1dd86212a240a7104af6cd3c.zip | |
Merge pull request #176071 from klemensn/libdigidocpp-fix-newer-openssl
libdigidocpp: Fix crashes due to newer OpenSSL
| -rw-r--r-- | pkgs/development/libraries/libdigidocpp/default.nix | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix index 984b8179023..1e1e892e532 100644 --- a/pkgs/development/libraries/libdigidocpp/default.nix +++ b/pkgs/development/libraries/libdigidocpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, makeWrapper, minizip, pcsclite, opensc, openssl +{ lib, stdenv, fetchurl, fetchpatch, cmake, makeWrapper, minizip, pcsclite, opensc, openssl , xercesc, xml-security-c, pkg-config, xsd, zlib, xalanc, xxd }: stdenv.mkDerivation rec { @@ -10,6 +10,18 @@ stdenv.mkDerivation rec { sha256 = "sha256-U5i5IAyJF4359q6M6mQemEuG7+inPYIXqLy8GHv4dkg="; }; + patches = [ + (fetchpatch { + # fix runtime crashes when signing with OpenSSL>1.1.1l + # https://github.com/open-eid/libdigidocpp/issues/474 asks for a new release + url = "https://github.com/open-eid/libdigidocpp/commit/42a8cfd834c10bdd206fe784a13217df222b1c8e.patch"; + sha256 = "sha256-o3ZT0dXhIu79C5ZR+2HPdLMZ3YwPG1v3vly5bseuxtU="; + excludes = [ + ".github/workflows/build.yml" # failed hunk + ]; + }) + ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config xxd ]; buildInputs = [ |