diff options
| author | Robin Gloster <mail@glob.in> | 2016-08-03 13:19:52 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-08-03 13:20:32 +0000 |
| commit | 3f9e8601f2a8537de90f04375400538049bbdaf2 (patch) | |
| tree | b1169f5b78739c4fb581171020832e31ebd71bd7 /pkgs/development/libraries/vxl | |
| parent | 98473cdb15d18e5f0b862a72ac7e629a433481fc (diff) | |
| download | nixpkgs-3f9e8601f2a8537de90f04375400538049bbdaf2.tar nixpkgs-3f9e8601f2a8537de90f04375400538049bbdaf2.tar.gz nixpkgs-3f9e8601f2a8537de90f04375400538049bbdaf2.tar.bz2 nixpkgs-3f9e8601f2a8537de90f04375400538049bbdaf2.tar.lz nixpkgs-3f9e8601f2a8537de90f04375400538049bbdaf2.tar.xz nixpkgs-3f9e8601f2a8537de90f04375400538049bbdaf2.tar.zst nixpkgs-3f9e8601f2a8537de90f04375400538049bbdaf2.zip | |
vxl: remove obsolete patch
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, 0 insertions, 17 deletions
diff --git a/pkgs/development/libraries/vxl/default.nix b/pkgs/development/libraries/vxl/default.nix index faed2052fa5..b9f3c0e64d6 100644 --- a/pkgs/development/libraries/vxl/default.nix +++ b/pkgs/development/libraries/vxl/default.nix @@ -22,8 +22,6 @@ 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 deleted file mode 100644 index 4660f9e8f48..00000000000 --- a/pkgs/development/libraries/vxl/gcc5.patch +++ /dev/null @@ -1,15 +0,0 @@ -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 |