From 8fdb672c6a2cde3870d72ccc1dc1d2b118fd79d7 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 13 Jun 2020 21:43:22 +0100 Subject: [PATCH] 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. --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b98074531695b..b18a27c4ed414 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 { };