From 4f93f4b82b8d1bb9a9af2b5405d698fb816ef734 Mon Sep 17 00:00:00 2001 From: Yureka Date: Mon, 6 Sep 2021 13:59:16 +0200 Subject: xmlsec: use latest nss The issues mentioned seem to be fixed in the latest xmlsec release --- pkgs/development/libraries/xmlsec/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'pkgs/development/libraries/xmlsec') diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 2dceaeda649..b86189306b8 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, libxml2, gnutls, libxslt, pkg-config, libgcrypt, libtool -# nss_3_53 is used instead of the latest due to a number of issues: -# https://github.com/lsh123/xmlsec/issues?q=is%3Aissue+is%3Aopen+nss -, openssl, nss_3_53, lib, runCommandCC, writeText }: +, openssl, nss, lib, runCommandCC, writeText }: lib.fix (self: stdenv.mkDerivation rec { @@ -24,11 +22,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libxml2 gnutls libxslt libgcrypt libtool openssl nss_3_53 ]; + buildInputs = [ libxml2 gnutls libxslt libgcrypt libtool openssl nss ]; enableParallelBuilding = true; doCheck = true; - checkInputs = [ nss_3_53.tools ]; + checkInputs = [ nss.tools ]; preCheck = '' substituteInPlace tests/testrun.sh \ --replace 'timestamp=`date +%Y%m%d_%H%M%S`' 'timestamp=19700101_000000' \ -- cgit 1.4.1