From 56bd6be2cf76bfed7146e48fe0f5d0361064b809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Tue, 22 Mar 2016 11:30:37 +0100
Subject: [PATCH] Fixing vxl build with gcc 5.

---
 pkgs/development/libraries/vxl/default.nix |  3 ++-
 pkgs/development/libraries/vxl/gcc5.patch  | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/vxl/gcc5.patch

diff --git a/pkgs/development/libraries/vxl/default.nix b/pkgs/development/libraries/vxl/default.nix
index b03b9a876a09..725a0bdfceaf 100644
--- a/pkgs/development/libraries/vxl/default.nix
+++ b/pkgs/development/libraries/vxl/default.nix
@@ -20,12 +20,13 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
+  patches = [ ./gcc5.patch ];
+
   meta = {
     description = "C++ Libraries for Computer Vision Research and Implementation";
     homepage = http://vxl.sourceforge.net/;
     license = "VXL License";
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
-    broken = true; # requires fix for gcc 5: https://lists.fedoraproject.org/pipermail/scm-commits/Week-of-Mon-20150216/1511118.html
   };
 }
diff --git a/pkgs/development/libraries/vxl/gcc5.patch b/pkgs/development/libraries/vxl/gcc5.patch
new file mode 100644
index 000000000000..4660f9e8f483
--- /dev/null
+++ b/pkgs/development/libraries/vxl/gcc5.patch
@@ -0,0 +1,15 @@
+https://lists.fedoraproject.org/pipermail/scm-commits/Week-of-Mon-20150216/1511118.html
+
+--- vxl-git4e07960/vcl/vcl_compiler.h~	2012-11-02 12:08:21.000000000 +0100
++++ vxl-git4e07960/vcl/vcl_compiler.h	2015-02-15 13:50:46.376329878 +0100
+@@ -119,6 +119,10 @@
+ #  else
+ #   define VCL_GCC_40
+ #  endif
++# elif (__GNUC__== 5)
++// pretend GCC 5 to be GCC 4
++#  define VCL_GCC_4
++#  define VCL_GCC_41
+ # else
+ #  error "Dunno about this gcc"
+ # endif