Unverified Commit 5f5ede24 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

opencv: switch to openexr_3 (#375774)

parents 55c3343f c312f6f8

pkgs/development/libraries/opencv/4.x.nix

+3 −6
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
  glib,

  glog,

  gflags,

  protobuf_29,

  protobuf_21,

  config,

  ocl-icd,

  qimgv,
@@ -29,7 +29,6 @@ 
  libwebp,

  enableEXR ? !stdenv.hostPlatform.isDarwin,

  openexr,

  ilmbase,

  enableJPEG2000 ? true,

  openjpeg,

  enableEigen ? true,
@@ -338,7 +337,7 @@ effectiveStdenv.mkDerivation { 
      glib

      glog

      pcre2

      protobuf_29

      protobuf_21

      zlib

    ]

    ++ optionals enablePython [
@@ -370,7 +369,6 @@ effectiveStdenv.mkDerivation { 
    ]

    ++ optionals enableEXR [

      openexr

      ilmbase

    ]

    ++ optionals enableJPEG2000 [

      openjpeg
@@ -464,8 +462,6 @@ effectiveStdenv.mkDerivation { 
      cudaPackages.cuda_nvcc

    ];



  env.NIX_CFLAGS_COMPILE = optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR";



  # Configure can't find the library without this.

  OpenBLAS_HOME = optionalString withOpenblas openblas_.dev;

  OpenBLAS = optionalString withOpenblas openblas_;
@@ -475,6 +471,7 @@ effectiveStdenv.mkDerivation { 
      (cmakeBool "OPENCV_GENERATE_PKGCONFIG" true)

      (cmakeBool "WITH_OPENMP" true)

      (cmakeBool "BUILD_PROTOBUF" false)

      (cmakeBool "WITH_PROTOBUF" true)

      (cmakeBool "PROTOBUF_UPDATE_FILES" true)

      (cmakeBool "OPENCV_ENABLE_NONFREE" enableUnfree)

      (cmakeBool "BUILD_TESTS" runAccuracyTests)

pkgs/top-level/all-packages.nix

+0 −1
Original line number Diff line number Diff line
@@ -10631,7 +10631,6 @@ with pkgs; 
    # TODO: LTO does not work.

    # https://github.com/NixOS/nixpkgs/issues/343123

    enableLto = false;

    openexr = openexr_2;

  };















  opencv4WithoutCuda = opencv4.override {