saga: explicitly use opencv2
This commit is contained in:
parent
e31b4c313b
commit
c0137489ef
@ -1,5 +1,5 @@
|
|||||||
{ stdenv, fetchurl, gdal, wxGTK30, proj, libiodbc, lzma,
|
{ stdenv, fetchurl, gdal, wxGTK30, proj, libiodbc, lzma,
|
||||||
libharu, opencv, vigra, postgresql, Cocoa,
|
libharu, opencv2, vigra, postgresql, Cocoa,
|
||||||
unixODBC , poppler, hdf4, hdf5, netcdf, sqlite, qhull, giflib }:
|
unixODBC , poppler, hdf4, hdf5, netcdf, sqlite, qhull, giflib }:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
@ -8,7 +8,7 @@ stdenv.mkDerivation {
|
|||||||
|
|
||||||
# See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs
|
# See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs
|
||||||
# for why the have additional buildInputs on darwin
|
# for why the have additional buildInputs on darwin
|
||||||
buildInputs = [ gdal wxGTK30 proj libharu opencv vigra postgresql libiodbc lzma
|
buildInputs = [ gdal wxGTK30 proj libharu opencv2 vigra postgresql libiodbc lzma
|
||||||
qhull giflib ]
|
qhull giflib ]
|
||||||
++ stdenv.lib.optionals stdenv.isDarwin
|
++ stdenv.lib.optionals stdenv.isDarwin
|
||||||
[ Cocoa unixODBC poppler hdf4.out hdf5 netcdf sqlite ];
|
[ Cocoa unixODBC poppler hdf4.out hdf5 netcdf sqlite ];
|
||||||
|
Loading…
x
Reference in New Issue
Block a user