From e31b4c313b9fcd5316a3b3d18462c1647d17863c Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 4 May 2020 20:42:46 +0300 Subject: [PATCH 1/7] opencv: rename and default to opencv4 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1adb4e0eb27..4dd7c0e2363b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13798,7 +13798,7 @@ in openct = callPackage ../development/libraries/openct { }; - opencv = callPackage ../development/libraries/opencv { + opencv2 = callPackage ../development/libraries/opencv { inherit (darwin.apple_sdk.frameworks) Cocoa QTKit; }; @@ -13814,6 +13814,8 @@ in inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration; }; + opencv = opencv4; + openexr = callPackage ../development/libraries/openexr { }; openexrid-unstable = callPackage ../development/libraries/openexrid-unstable { }; From c0137489ef9c798600530b17b749d5308aff9233 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 5 May 2020 10:32:14 +0300 Subject: [PATCH 2/7] saga: explicitly use opencv2 --- pkgs/applications/gis/saga/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index 05f895bdee15..388ac1ee7a7f 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, gdal, wxGTK30, proj, libiodbc, lzma, - libharu, opencv, vigra, postgresql, Cocoa, + libharu, opencv2, vigra, postgresql, Cocoa, unixODBC , poppler, hdf4, hdf5, netcdf, sqlite, qhull, giflib }: stdenv.mkDerivation { @@ -8,7 +8,7 @@ stdenv.mkDerivation { # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs # for why the have additional buildInputs on darwin - buildInputs = [ gdal wxGTK30 proj libharu opencv vigra postgresql libiodbc lzma + buildInputs = [ gdal wxGTK30 proj libharu opencv2 vigra postgresql libiodbc lzma qhull giflib ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa unixODBC poppler hdf4.out hdf5 netcdf sqlite ]; From 8277f8a4ec8c84de2aeaf9c71e4f91fe8e8a3f43 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 5 May 2020 13:03:02 +0300 Subject: [PATCH 3/7] p2pvc: exlicitly use opencv2 --- pkgs/applications/video/p2pvc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/p2pvc/default.nix b/pkgs/applications/video/p2pvc/default.nix index 219954ff9f20..91468ea1ee60 100644 --- a/pkgs/applications/video/p2pvc/default.nix +++ b/pkgs/applications/video/p2pvc/default.nix @@ -1,10 +1,10 @@ -{ stdenv, pkgconfig, fetchFromGitHub, opencv, ncurses, portaudio }: +{ stdenv, pkgconfig, fetchFromGitHub, opencv2, ncurses, portaudio }: stdenv.mkDerivation { name = "p2pvc"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ opencv ncurses portaudio ]; + buildInputs = [ opencv2 ncurses portaudio ]; enableParallelBuilding = true; From 4cd1b7a7c78f42d13033fe8cf1fd4ff18fdb6af4 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 5 May 2020 13:08:01 +0300 Subject: [PATCH 4/7] pfstools: use opencv2 explicitly --- 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 051adb0742f9..1c437a3f05cd 100644 --- a/pkgs/tools/graphics/pfstools/default.nix +++ b/pkgs/tools/graphics/pfstools/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, pkgconfig, darwin , openexr, zlib, imagemagick, libGLU, libGL, freeglut, fftwFloat -, fftw, gsl, libexif, perl, opencv, qt5, netpbm +, fftw, gsl, libexif, perl, opencv2, qt5, netpbm }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ openexr zlib imagemagick fftwFloat - fftw gsl libexif perl opencv qt5.qtbase netpbm + fftw gsl libexif perl opencv2 qt5.qtbase netpbm ] ++ (if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [ OpenGL GLUT ]) else [ From f68a0031bbf49dde2cf4026dc6d45d7f3835dc0b Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 5 May 2020 13:44:55 +0300 Subject: [PATCH 5/7] faust2jack: explicitly use opencv2 --- pkgs/applications/audio/faust/faust2jack.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/faust/faust2jack.nix b/pkgs/applications/audio/faust/faust2jack.nix index f032f435a35e..26478b2bb2e5 100644 --- a/pkgs/applications/audio/faust/faust2jack.nix +++ b/pkgs/applications/audio/faust/faust2jack.nix @@ -2,7 +2,7 @@ , gtk2 , jack2Full , alsaLib -, opencv +, opencv2 , libsndfile }: @@ -20,7 +20,7 @@ faust.wrapWithBuildEnv { gtk2 jack2Full alsaLib - opencv + opencv2 libsndfile ]; From ce6107be9c6b89c32c84b4305f3918f003ccf623 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 5 May 2020 13:45:13 +0300 Subject: [PATCH 6/7] faust2jaqt: explicitly use opencv2 --- pkgs/applications/audio/faust/faust2jaqt.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/faust/faust2jaqt.nix b/pkgs/applications/audio/faust/faust2jaqt.nix index 144d19cb01e4..a2f1c2139a1a 100644 --- a/pkgs/applications/audio/faust/faust2jaqt.nix +++ b/pkgs/applications/audio/faust/faust2jaqt.nix @@ -1,6 +1,6 @@ { faust , jack2Full -, opencv +, opencv2 , qt4 , libsndfile , which @@ -17,7 +17,7 @@ faust.wrapWithBuildEnv { propagatedBuildInputs = [ jack2Full - opencv + opencv2 qt4 libsndfile which From 53effac04003090683768615887460026c25f5fb Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 5 May 2020 13:48:55 +0300 Subject: [PATCH 7/7] mathematica: explicitly use opencv2 --- pkgs/applications/science/math/mathematica/10.nix | 4 ++-- pkgs/applications/science/math/mathematica/11.nix | 4 ++-- pkgs/applications/science/math/mathematica/9.nix | 4 ++-- pkgs/applications/science/math/mathematica/default.nix | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/science/math/mathematica/10.nix b/pkgs/applications/science/math/mathematica/10.nix index c7da7b16da8f..277fb1984c44 100644 --- a/pkgs/applications/science/math/mathematica/10.nix +++ b/pkgs/applications/science/math/mathematica/10.nix @@ -8,7 +8,7 @@ , gcc , glib , ncurses -, opencv +, opencv2 , openssl , unixODBC , xorg @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { gcc.libc glib ncurses - opencv + opencv2 openssl unixODBC libxml2 diff --git a/pkgs/applications/science/math/mathematica/11.nix b/pkgs/applications/science/math/mathematica/11.nix index 898d6a486351..1c698a5e5428 100644 --- a/pkgs/applications/science/math/mathematica/11.nix +++ b/pkgs/applications/science/math/mathematica/11.nix @@ -10,7 +10,7 @@ , gcc , glib , ncurses -, opencv +, opencv2 , openssl , unixODBC , xkeyboard_config @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { gcc.libc glib ncurses - opencv + opencv2 openssl unixODBC xkeyboard_config diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix index 617ac8657132..d0967485c01f 100644 --- a/pkgs/applications/science/math/mathematica/9.nix +++ b/pkgs/applications/science/math/mathematica/9.nix @@ -8,7 +8,7 @@ , gcc , glib , ncurses -, opencv +, opencv2 , openssl , unixODBC , xorg @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { gcc.libc glib ncurses - opencv + opencv2 openssl unixODBC ] ++ (with xorg; [ diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 7831640b1244..94d72eec6ae4 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -11,7 +11,7 @@ , glib , libssh2 , ncurses -, opencv +, opencv2 , openssl , unixODBC , xkeyboard_config @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { glib libssh2 ncurses - opencv + opencv2 openssl stdenv.cc.cc.lib unixODBC