diff options
| author | Robin Gloster <mail@glob.in> | 2016-03-28 15:16:29 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-03-28 15:16:29 +0000 |
| commit | f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3 (patch) | |
| tree | 0f17999d3a5444f16f09e0c1d7f3075e0224e731 /pkgs/development/libraries/vxl | |
| parent | 3f45f0948d6fe158bed063adb66850ded0ba4861 (diff) | |
| parent | c61445357e2a92470bee43a71a10baef1a3196e4 (diff) | |
| download | nixpkgs-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.tar nixpkgs-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.tar.gz nixpkgs-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.tar.bz2 nixpkgs-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.tar.lz nixpkgs-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.tar.xz nixpkgs-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.tar.zst nixpkgs-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/development/libraries/vxl')
| -rw-r--r-- | pkgs/development/libraries/vxl/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/vxl/gcc5.patch | 15 |
2 files changed, 17 insertions, 0 deletions
diff --git a/pkgs/development/libraries/vxl/default.nix b/pkgs/development/libraries/vxl/default.nix index b9f3c0e64d6..faed2052fa5 100644 --- a/pkgs/development/libraries/vxl/default.nix +++ b/pkgs/development/libraries/vxl/default.nix @@ -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/; diff --git a/pkgs/development/libraries/vxl/gcc5.patch b/pkgs/development/libraries/vxl/gcc5.patch new file mode 100644 index 00000000000..4660f9e8f48 --- /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 |