Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-03-28 15:16:29 +00:00
parent 3f45f0948d c61445357e
commit f60c9df0ba
628 changed files with 60034 additions and 8180 deletions
@@ -22,6 +22,8 @@ stdenv.mkDerivation {

  enableParallelBuilding = true;

+  patches = [ ./gcc5.patch ];
+
  meta = {
    description = "C++ Libraries for Computer Vision Research and Implementation";
    homepage = http://vxl.sourceforge.net/;