From 0bc52a52c2eb8eb85f7970d1780cbbfe1306efd4 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 20 Aug 2024 19:24:09 +0100 Subject: [PATCH] pfstools: unpin OpenCV 2 This builds fine with OpenCV 4 using `enableUnfree`. --- pkgs/tools/graphics/pfstools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix index ac41fd9c94f6..7d595c5e4ce1 100644 --- a/pkgs/tools/graphics/pfstools/default.nix +++ b/pkgs/tools/graphics/pfstools/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, mkDerivation, fetchurl, cmake, pkg-config, darwin , openexr, zlib, imagemagick6, libGLU, libGL, libglut, fftwFloat , fftw, gsl, libexif, perl, qtbase, netpbm -, enableUnfree ? false, opencv2 +, enableUnfree ? false, opencv }: mkDerivation rec { @@ -36,7 +36,7 @@ mkDerivation rec { OpenGL GLUT ]) else [ libGLU libGL libglut - ]) ++ lib.optional enableUnfree (opencv2.override { enableUnfree = true; }); + ]) ++ lib.optional enableUnfree (opencv.override { enableUnfree = true; }); patches = [ ./glut.patch ./threads.patch ./pfstools.patch ./pfsalign.patch ];