diff options
| author | Robert Scott <code@humanleg.org.uk> | 2019-11-24 23:14:51 +0000 |
|---|---|---|
| committer | Renaud <c0bw3b@users.noreply.github.com> | 2019-11-25 00:14:51 +0100 |
| commit | 817b066f4b4dad161d04a03398f2261071b705e7 (patch) | |
| tree | 2721237ecb0e91be3e8d5ac1bf9f071ca224f1e9 /pkgs/applications/graphics/nomacs/default.nix | |
| parent | 1a388b8bff4dcfb56b0e88079dd84292f223b8fc (diff) | |
| download | nixpkgs-817b066f4b4dad161d04a03398f2261071b705e7.tar nixpkgs-817b066f4b4dad161d04a03398f2261071b705e7.tar.gz nixpkgs-817b066f4b4dad161d04a03398f2261071b705e7.tar.bz2 nixpkgs-817b066f4b4dad161d04a03398f2261071b705e7.tar.lz nixpkgs-817b066f4b4dad161d04a03398f2261071b705e7.tar.xz nixpkgs-817b066f4b4dad161d04a03398f2261071b705e7.tar.zst nixpkgs-817b066f4b4dad161d04a03398f2261071b705e7.zip | |
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
Diffstat (limited to 'pkgs/applications/graphics/nomacs/default.nix')
| -rw-r--r-- | pkgs/applications/graphics/nomacs/default.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index 62fae518b92..48a79e8844e 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -1,6 +1,7 @@ { stdenv , mkDerivation , fetchFromGitHub +, fetchpatch , cmake , pkgconfig @@ -9,7 +10,7 @@ , qtsvg , exiv2 -, opencv +, opencv4 , libraw , libtiff , quazip @@ -28,6 +29,12 @@ mkDerivation rec { patches = [ ./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; @@ -43,7 +50,7 @@ mkDerivation rec { qttools qtsvg exiv2 - opencv + opencv4 libraw libtiff quazip]; |