Commit 2b2a1378 authored by Augustin Trancart's avatar Augustin Trancart
Browse files

opencv: switch to openexr_3

parent beb11d38

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

+0 −4
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
  libwebp,

  enableEXR ? !stdenv.hostPlatform.isDarwin,

  openexr,

  ilmbase,

  enableJPEG2000 ? true,

  openjpeg,

  enableEigen ? true,
@@ -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_;

pkgs/top-level/all-packages.nix

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

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

    enableLto = false;

    openexr = openexr_2;

  };















  opencv4WithoutCuda = opencv4.override {