diff options
| author | Ben Darwin <bcdarwin@gmail.com> | 2023-09-21 13:27:24 -0400 |
|---|---|---|
| committer | Ben Darwin <bcdarwin@gmail.com> | 2023-10-10 17:31:32 -0400 |
| commit | 935338d123b4f183820c134edb058e5d022d6e8b (patch) | |
| tree | 7b8de887d40719e2e10baf01c21fe9218669e030 | |
| parent | 2a2ba3dc3f08090e12cee4c11ba4a558a46a5fff (diff) | |
| download | nixlib-935338d123b4f183820c134edb058e5d022d6e8b.tar nixlib-935338d123b4f183820c134edb058e5d022d6e8b.tar.gz nixlib-935338d123b4f183820c134edb058e5d022d6e8b.tar.bz2 nixlib-935338d123b4f183820c134edb058e5d022d6e8b.tar.lz nixlib-935338d123b4f183820c134edb058e5d022d6e8b.tar.xz nixlib-935338d123b4f183820c134edb058e5d022d6e8b.tar.zst nixlib-935338d123b4f183820c134edb058e5d022d6e8b.zip | |
caffe: opencv3 -> opencv4
| -rw-r--r-- | pkgs/applications/science/math/caffe/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index 527c96f4d64c..42c160393595 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -1,12 +1,13 @@ { config, stdenv, lib , fetchFromGitHub , fetchurl +, fetchpatch , cmake , boost , gflags , glog , hdf5-cpp -, opencv3 +, opencv4 , protobuf , doxygen , blas @@ -71,7 +72,7 @@ stdenv.mkDerivation rec { ++ ["-DUSE_LEVELDB=${toggle leveldbSupport}"] ++ ["-DUSE_LMDB=${toggle lmdbSupport}"]; - buildInputs = [ boost gflags glog protobuf hdf5-cpp opencv3 blas ] + buildInputs = [ boost gflags glog protobuf hdf5-cpp opencv4 blas ] ++ lib.optional cudaSupport cudatoolkit ++ lib.optional cudnnSupport cudnn ++ lib.optional lmdbSupport lmdb @@ -96,6 +97,11 @@ stdenv.mkDerivation rec { patches = [ ./darwin.patch + (fetchpatch { + name = "support-opencv4"; + url = "https://github.com/BVLC/caffe/pull/6638/commits/0a04cc2ccd37ba36843c18fea2d5cbae6e7dd2b5.patch"; + hash = "sha256-ZegTvp0tTHlopQv+UzHDigs6XLkP2VfqLCWXl6aKJSI="; + }) ] ++ lib.optional pythonSupport (substituteAll { src = ./python.patch; inherit (python.sourceVersion) major minor; # Should be changed in case of PyPy diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed83ff22184b..e2930432b297 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39829,7 +39829,7 @@ with pkgs; caffe = callPackage ../applications/science/math/caffe ({ inherit (config) cudaSupport; cudaPackages = cudaPackages_10_1; - opencv3 = opencv3WithoutCuda; # Used only for image loading. + opencv4 = opencv4WithoutCuda; # Used only for image loading. blas = openblas; inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo; } // (config.caffe or {})); |