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

Merge pull request #104478 from Mic92/opencv

Browse Source
This commit is contained in:
Jörg Thalheim 2020-11-23 17:51:33 +01:00 committed by GitHub
commit 816009490e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/graphics/digikam/default.nix
View File

@ -39,7 +39,7 @@
, marble , marble
, libGL , libGL
, libGLU , libGLU
, opencv3 , opencv
, pcre , pcre
, threadweaver , threadweaver
, x265 , x265
@ -83,7 +83,7 @@ mkDerivation rec {
libusb1 libusb1
libGL libGL
libGLU libGLU
opencv3 opencv
pcre pcre
x265 x265

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

@ -3,7 +3,7 @@
, cmake , cmake
, ninja , ninja
, pkg-config , pkg-config
, opencv3 , opencv
, openexr , openexr
, graphicsmagick , graphicsmagick
, fftw , fftw
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
libjpeg libjpeg
libtiff libtiff
libpng libpng
opencv3 opencv
openexr openexr
graphicsmagick graphicsmagick
]; ];

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

@ -25263,9 +25263,7 @@ in
dhewm3 = callPackage ../games/dhewm3 {}; dhewm3 = callPackage ../games/dhewm3 {};
digikam = libsForQt514.callPackage ../applications/graphics/digikam { digikam = libsForQt514.callPackage ../applications/graphics/digikam {};
opencv3 = opencv3WithoutCuda;
};
displaycal = callPackage ../applications/graphics/displaycal {}; displaycal = callPackage ../applications/graphics/displaycal {};