Commit 0bc52a52 authored by Emily's avatar Emily
Browse files

pfstools: unpin OpenCV 2 

This builds fine with OpenCV 4 using `enableUnfree`.
parent 54f844da

pkgs/tools/graphics/pfstools/default.nix

+2 −2
Original line number Diff line number Diff line 
{ 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 ];