armadillo: Fix failing build (#17764)

The upgrade of cmake to v3.6.0 broke this build. HDF5 now can
only be found if hdf5-cpp is used as buildInput.
However the upgrade made it possible to remove a patch:
CMake can now find openblas on its own.

pkgs/development/libraries/armadillo/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }:
+{ stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5-cpp }:
 
 stdenv.mkDerivation rec {
   version = "7.200.2";
@@ -9,12 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "1yvx75caks477jqwx5gspi6946jialddk00wdvg6dnh5wdi2xasm";
   };
 
-  buildInputs = [ cmake openblasCompat superlu hdf5 ];
+  buildInputs = [ cmake openblasCompat superlu hdf5-cpp ];
 
   cmakeFlags = [ "-DDETECT_HDF5=ON" ];
 
-  patches = [ ./use-unix-config-on-OS-X.patch
-              ./use-OpenBLAS-as-LAPACK.patch ];
+  patches = [ ./use-unix-config-on-OS-X.patch ];
   
   meta = with stdenv.lib; {
     description = "C++ linear algebra library";