From 4596835502f60dfc250494728d0995d6d4b9d4bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 26 Aug 2017 09:23:16 +0100
Subject: [PATCH] xml-security-c: fix gcc6 build

---
 .../libraries/xml-security-c/cxx11.patch        | 11 +++++++++++
 .../libraries/xml-security-c/default.nix        | 17 +++++++++--------
 2 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/development/libraries/xml-security-c/cxx11.patch

diff --git a/pkgs/development/libraries/xml-security-c/cxx11.patch b/pkgs/development/libraries/xml-security-c/cxx11.patch
new file mode 100644
index 000000000000..bc87d4c1411e
--- /dev/null
+++ b/pkgs/development/libraries/xml-security-c/cxx11.patch
@@ -0,0 +1,11 @@
+--- 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 37936caf2b9f..7ab6041e86dd 100644
--- a/pkgs/development/libraries/xml-security-c/default.nix
+++ b/pkgs/development/libraries/xml-security-c/default.nix
@@ -9,18 +9,19 @@ stdenv.mkDerivation rec {
     sha256 = "e5226e7319d44f6fd9147a13fb853f5c711b9e75bf60ec273a0ef8a190592583";
   };
 
-  patchPhase = ''
+  patches = [ ./cxx11.patch ];
+
+  postPatch = ''
     mkdir -p xsec/yes/lib
     sed -i -e 's/-O2 -DNDEBUG/-DNDEBUG/g' configure
   '';
 
-  configurePhase = ''
-    ./configure --prefix=$out \
-                --with-openssl \
-                --with-xerces \
-                --with-xalan \
-                --disable-static
-  '';
+  configureFlags = [
+    "--with-openssl"
+    "--with-xerces"
+    "--with-xalan"
+    "--disable-static"
+  ];
 
   buildInputs = [ xalanc xercesc openssl pkgconfig ];