summary refs log tree commit diff
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2019-07-30 00:03:24 +0200
committerRobin Gloster <mail@glob.in>2019-07-30 00:03:24 +0200
commit9ff94fb740edb14a747784b7898a7e830c896501 (patch)
tree953d1db56102a66d3d821841d8a229526cd67931
parentbdfc0887de21f4f82c5d0d3f931c3fe82c25f861 (diff)
downloadnixpkgs-9ff94fb740edb14a747784b7898a7e830c896501.tar
nixpkgs-9ff94fb740edb14a747784b7898a7e830c896501.tar.gz
nixpkgs-9ff94fb740edb14a747784b7898a7e830c896501.tar.bz2
nixpkgs-9ff94fb740edb14a747784b7898a7e830c896501.tar.lz
nixpkgs-9ff94fb740edb14a747784b7898a7e830c896501.tar.xz
nixpkgs-9ff94fb740edb14a747784b7898a7e830c896501.tar.zst
nixpkgs-9ff94fb740edb14a747784b7898a7e830c896501.zip
xml-security-c: 1.7.3 -> 2.0.2
-rw-r--r--pkgs/development/libraries/xml-security-c/cxx11.patch11
-rw-r--r--pkgs/development/libraries/xml-security-c/default.nix11
2 files changed, 2 insertions, 20 deletions
diff --git a/pkgs/development/libraries/xml-security-c/cxx11.patch b/pkgs/development/libraries/xml-security-c/cxx11.patch
deleted file mode 100644
index bc87d4c1411..00000000000
--- a/pkgs/development/libraries/xml-security-c/cxx11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xml-security-c-1.6.1/xsec/tools/checksig/InteropResolver.cpp.orig	2016-02-02 23:57:26.204655144 +0000
-+++ xml-security-c-1.6.1/xsec/tools/checksig/InteropResolver.cpp	2016-02-02 23:57:35.796692305 +0000
-@@ -645,7 +645,7 @@
- 
- 	}
- 
--	return false;
-+	return NULL;
- 
- }
- 
diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/pkgs/development/libraries/xml-security-c/default.nix
index fec4bbe8efe..35ae93e7939 100644
--- a/pkgs/development/libraries/xml-security-c/default.nix
+++ b/pkgs/development/libraries/xml-security-c/default.nix
@@ -2,20 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "xml-security-c-${version}";
-  version = "1.7.3";
+  version = "2.0.2";
 
   src = fetchurl {
     url = "https://www.apache.org/dist/santuario/c-library/${name}.tar.gz";
-    sha256 = "e5226e7319d44f6fd9147a13fb853f5c711b9e75bf60ec273a0ef8a190592583";
+    sha256 = "1prh5sxzipkqglpsh53iblbr7rxi54wbijxdjiahzjmrijqa40y3";
   };
 
-  patches = [ ./cxx11.patch ];
-
-  postPatch = ''
-    mkdir -p xsec/yes/lib
-    sed -i -e 's/-O2 -DNDEBUG/-DNDEBUG/g' configure
-  '';
-
   configureFlags = [
     "--with-openssl"
     "--with-xerces"