public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #86808 from doronbehar/rename-opencv

Browse Source
This commit is contained in:
Jörg Thalheim 2020-05-05 20:19:50 +01:00 committed by GitHub
commit 3c4096f18b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/faust/faust2jack.nix
View File

@ -2,7 +2,7 @@
, gtk2 , gtk2
, jack2Full , jack2Full
, alsaLib , alsaLib
, opencv , opencv2
, libsndfile , libsndfile
}: }:
@ -20,7 +20,7 @@ faust.wrapWithBuildEnv {
gtk2 gtk2
jack2Full jack2Full
alsaLib alsaLib
opencv opencv2
libsndfile libsndfile
]; ];

4
pkgs/applications/audio/faust/faust2jaqt.nix
View File

@ -1,6 +1,6 @@
{ faust { faust
, jack2Full , jack2Full
, opencv , opencv2
, qt4 , qt4
, libsndfile , libsndfile
, which , which
@ -17,7 +17,7 @@ faust.wrapWithBuildEnv {
propagatedBuildInputs = [ propagatedBuildInputs = [
jack2Full jack2Full
opencv opencv2
qt4 qt4
libsndfile libsndfile
which which

4
pkgs/applications/gis/saga/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, gdal, wxGTK30, proj, libiodbc, lzma, { 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 }: unixODBC , poppler, hdf4, hdf5, netcdf, sqlite, qhull, giflib }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -8,7 +8,7 @@ stdenv.mkDerivation {
# See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs
# for why the have additional buildInputs on darwin # 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 ] qhull giflib ]
++ stdenv.lib.optionals stdenv.isDarwin ++ stdenv.lib.optionals stdenv.isDarwin
[ Cocoa unixODBC poppler hdf4.out hdf5 netcdf sqlite ]; [ Cocoa unixODBC poppler hdf4.out hdf5 netcdf sqlite ];

4
pkgs/applications/science/math/mathematica/10.nix
View File

@ -8,7 +8,7 @@
, gcc , gcc
, glib , glib
, ncurses , ncurses
, opencv , opencv2
, openssl , openssl
, unixODBC , unixODBC
, xorg , xorg
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
gcc.libc gcc.libc
glib glib
ncurses ncurses
opencv opencv2
openssl openssl
unixODBC unixODBC
libxml2 libxml2

4
pkgs/applications/science/math/mathematica/11.nix
View File

@ -10,7 +10,7 @@
, gcc , gcc
, glib , glib
, ncurses , ncurses
, opencv , opencv2
, openssl , openssl
, unixODBC , unixODBC
, xkeyboard_config , xkeyboard_config
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
gcc.libc gcc.libc
glib glib
ncurses ncurses
opencv opencv2
openssl openssl
unixODBC unixODBC
xkeyboard_config xkeyboard_config

4
pkgs/applications/science/math/mathematica/9.nix
View File

@ -8,7 +8,7 @@
, gcc , gcc
, glib , glib
, ncurses , ncurses
, opencv , opencv2
, openssl , openssl
, unixODBC , unixODBC
, xorg , xorg
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
gcc.libc gcc.libc
glib glib
ncurses ncurses
opencv opencv2
openssl openssl
unixODBC unixODBC
] ++ (with xorg; [ ] ++ (with xorg; [

4
pkgs/applications/science/math/mathematica/default.nix
View File

@ -11,7 +11,7 @@
, glib , glib
, libssh2 , libssh2
, ncurses , ncurses
, opencv , opencv2
, openssl , openssl
, unixODBC , unixODBC
, xkeyboard_config , xkeyboard_config
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
glib glib
libssh2 libssh2
ncurses ncurses
opencv opencv2
openssl openssl
stdenv.cc.cc.lib stdenv.cc.cc.lib
unixODBC unixODBC

4
pkgs/applications/video/p2pvc/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, pkgconfig, fetchFromGitHub, opencv, ncurses, portaudio }: { stdenv, pkgconfig, fetchFromGitHub, opencv2, ncurses, portaudio }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "p2pvc"; name = "p2pvc";
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ opencv ncurses portaudio ]; buildInputs = [ opencv2 ncurses portaudio ];
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/tools/graphics/pfstools/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, cmake, pkgconfig, darwin { stdenv, fetchurl, cmake, pkgconfig, darwin
, openexr, zlib, imagemagick, libGLU, libGL, freeglut, fftwFloat , openexr, zlib, imagemagick, libGLU, libGL, freeglut, fftwFloat
, fftw, gsl, libexif, perl, opencv, qt5, netpbm , fftw, gsl, libexif, perl, opencv2, qt5, netpbm
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ buildInputs = [
openexr zlib imagemagick fftwFloat 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; [ ] ++ (if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [
OpenGL GLUT OpenGL GLUT
]) else [ ]) else [

4
pkgs/top-level/all-packages.nix
View File

@ -13806,7 +13806,7 @@ in
openct = callPackage ../development/libraries/openct { }; openct = callPackage ../development/libraries/openct { };
opencv = callPackage ../development/libraries/opencv { opencv2 = callPackage ../development/libraries/opencv {
inherit (darwin.apple_sdk.frameworks) Cocoa QTKit; inherit (darwin.apple_sdk.frameworks) Cocoa QTKit;
}; };
@ -13822,6 +13822,8 @@ in
inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration; inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration;
}; };
opencv = opencv4;
openexr = callPackage ../development/libraries/openexr { }; openexr = callPackage ../development/libraries/openexr { };
openexrid-unstable = callPackage ../development/libraries/openexrid-unstable { }; openexrid-unstable = callPackage ../development/libraries/openexrid-unstable { };