nomacs: switch to using opencv4 (#72749)

opencv2 has known, unfixed security vulnerabilities. nomacs itself
states the minimum supported version is 3.4 & includes a script to
install opencv4, suggesting it is supported

darwin requires a patch to update its cmake file to make it less
restrictive over this
This commit is contained in:
Robert Scott 2019-11-24 23:14:51 +00:00 committed by Renaud
parent 1a388b8bff
commit 817b066f4b

View File

@ -1,6 +1,7 @@
{ stdenv { stdenv
, mkDerivation , mkDerivation
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, cmake , cmake
, pkgconfig , pkgconfig
@ -9,7 +10,7 @@
, qtsvg , qtsvg
, exiv2 , exiv2
, opencv , opencv4
, libraw , libraw
, libtiff , libtiff
, quazip , quazip
@ -28,6 +29,12 @@ mkDerivation rec {
patches = [ patches = [
./nomacs-iostream.patch ./nomacs-iostream.patch
(fetchpatch {
name = "darwin-less-restrictive-opencv.patch";
url = "https://github.com/nomacs/nomacs/commit/d182fce4bcd9a25bd15e3de065ca67849a32458c.patch";
sha256 = "0j6sviwrjn69nqf59hjn30c4j838h8az7rnlwcx8ymlb21vd9x2h";
stripLen = 1;
})
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;
@ -43,7 +50,7 @@ mkDerivation rec {
qttools qttools
qtsvg qtsvg
exiv2 exiv2
opencv opencv4
libraw libraw
libtiff libtiff
quazip]; quazip];