diff options
| author | Robert Scott <code@humanleg.org.uk> | 2020-06-13 21:43:22 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-11-21 11:42:45 +0100 |
| commit | 8fdb672c6a2cde3870d72ccc1dc1d2b118fd79d7 (patch) | |
| tree | ea9c081f15220dbe54cb366c63c646396ad3a741 | |
| parent | Merge pull request #104362 from NixOS/staging-20.03 (diff) | |
| download | nixpkgs-8fdb672c6a2cde3870d72ccc1dc1d2b118fd79d7.tar.gz | |
opencv3, opencv4: use openblasCompat
without master's fix in #83888, opencv3 & opencv4 end up with an 8-byte
openblas, which it does work with. however this causes the python
bindings to also end up with an 8-byte openblas, which numpy doesn't work
with. force 4-byte openblas for opencv.
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b98074531695..b18a27c4ed41 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13655,6 +13655,7 @@ in opencv3 = callPackage ../development/libraries/opencv/3.x.nix { inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration; + openblas = openblasCompat; }; opencv3WithoutCuda = opencv3.override { @@ -13663,6 +13664,7 @@ in opencv4 = callPackage ../development/libraries/opencv/4.x.nix { inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration; + openblas = openblasCompat; }; openexr = callPackage ../development/libraries/openexr { }; |