diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-05-05 20:19:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-05 20:19:50 +0100 |
| commit | 3c4096f18bde58a6d7f2edc4defea2765e0b496f (patch) | |
| tree | 7ee928c9a4e31f705ff5874b36af83316b7964ac /pkgs/top-level/all-packages.nix | |
| parent | 6ca94ab1ea0c50cbe01c14d79c9c7c95b495b972 (diff) | |
| parent | 53effac04003090683768615887460026c25f5fb (diff) | |
| download | nixlib-3c4096f18bde58a6d7f2edc4defea2765e0b496f.tar nixlib-3c4096f18bde58a6d7f2edc4defea2765e0b496f.tar.gz nixlib-3c4096f18bde58a6d7f2edc4defea2765e0b496f.tar.bz2 nixlib-3c4096f18bde58a6d7f2edc4defea2765e0b496f.tar.lz nixlib-3c4096f18bde58a6d7f2edc4defea2765e0b496f.tar.xz nixlib-3c4096f18bde58a6d7f2edc4defea2765e0b496f.tar.zst nixlib-3c4096f18bde58a6d7f2edc4defea2765e0b496f.zip | |
Merge pull request #86808 from doronbehar/rename-opencv
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7238ab5cd1c7..67363c2b9053 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13806,7 +13806,7 @@ in openct = callPackage ../development/libraries/openct { }; - opencv = callPackage ../development/libraries/opencv { + opencv2 = callPackage ../development/libraries/opencv { inherit (darwin.apple_sdk.frameworks) Cocoa QTKit; }; @@ -13822,6 +13822,8 @@ in inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration; }; + opencv = opencv4; + openexr = callPackage ../development/libraries/openexr { }; openexrid-unstable = callPackage ../development/libraries/openexrid-unstable { }; |