Merge pull request #74301 from risicle/ris-gmic-opencv3

gmic, gmic-qt: switch to opencv3
This commit is contained in:
Jan Tojnar 2019-12-06 02:24:11 +01:00 committed by GitHub
commit 3e074a47b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View file

@ -7,7 +7,7 @@
, fetchFromGitLab , fetchFromGitLab
, cmake , cmake
, pkgconfig , pkgconfig
, opencv , opencv3
, openexr , openexr
, graphicsmagick , graphicsmagick
, fftw , fftw
@ -120,7 +120,7 @@ mkDerivation rec {
libjpeg libjpeg
libtiff libtiff
libpng libpng
opencv opencv3
openexr openexr
graphicsmagick graphicsmagick
curl curl

View file

@ -3,7 +3,7 @@
, cmake , cmake
, ninja , ninja
, pkgconfig , pkgconfig
, opencv , opencv3
, openexr , openexr
, graphicsmagick , graphicsmagick
, fftw , fftw
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
libjpeg libjpeg
libtiff libtiff
libpng libpng
opencv opencv3
openexr openexr
graphicsmagick graphicsmagick
]; ];