diff options
| author | Doron Behar <doron.behar@gmail.com> | 2020-05-04 20:42:46 +0300 |
|---|---|---|
| committer | Doron Behar <doron.behar@gmail.com> | 2020-05-04 20:42:46 +0300 |
| commit | e31b4c313b9fcd5316a3b3d18462c1647d17863c (patch) | |
| tree | 176fe623384e1e85127daf6faa13ea28cf78096b /pkgs/top-level/all-packages.nix | |
| parent | fa0849d02308ea4d0b646f6fffff07cd042ab810 (diff) | |
| download | nixlib-e31b4c313b9fcd5316a3b3d18462c1647d17863c.tar nixlib-e31b4c313b9fcd5316a3b3d18462c1647d17863c.tar.gz nixlib-e31b4c313b9fcd5316a3b3d18462c1647d17863c.tar.bz2 nixlib-e31b4c313b9fcd5316a3b3d18462c1647d17863c.tar.lz nixlib-e31b4c313b9fcd5316a3b3d18462c1647d17863c.tar.xz nixlib-e31b4c313b9fcd5316a3b3d18462c1647d17863c.tar.zst nixlib-e31b4c313b9fcd5316a3b3d18462c1647d17863c.zip | |
opencv: rename and default to opencv4
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 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 { }; |