Unverified Commit 13deb3a2 authored by Philip Taron's avatar Philip Taron
Browse files

opencv: remove with statements

parent 4d44b70c

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

+7 −7
Original line number Diff line number Diff line
@@ -134,9 +134,9 @@ let 
  };



  # See opencv/cmake/OpenCVDownload.cmake

  installExtraFiles = extra : with lib; ''

  installExtraFiles = extra : ''

    mkdir -p "${extra.dst}"

  '' + concatStrings (mapAttrsToList (name : md5 : ''

  '' + lib.concatStrings (lib.mapAttrsToList (name : md5 : ''

    ln -s "${extra.src}/${name}" "${extra.dst}/${md5}-${name}"

  '') extra.files);
@@ -197,7 +197,7 @@ stdenv.mkDerivation { 
    ++ lib.optional enableFfmpeg ffmpeg

    ++ lib.optionals (enableFfmpeg && stdenv.isDarwin)

                     [ VideoDecodeAcceleration bzip2 ]

    ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ])

    ++ lib.optionals enableGStreamer [ gst_all_1.gstreamer gst_all_1.gst-plugins-base ]

    ++ lib.optional enableOvis ogre

    ++ lib.optional enableGPhoto2 libgphoto2

    ++ lib.optional enableDC1394 libdc1394
@@ -292,13 +292,13 @@ stdenv.mkDerivation { 
    };

  };



  meta = with lib; {

  meta = {

    description = "Open Computer Vision Library with more than 500 algorithms";

    homepage = "https://opencv.org/";

    # OpenCV 3 won't build with CUDA 12+

    broken = enableCuda && cudaPackages.cudaAtLeast "12";

    license = with licenses; if enableUnfree then unfree else bsd3;

    maintainers = with maintainers; [mdaiter basvandijk];

    platforms = with platforms; linux ++ darwin;

    license = if enableUnfree then lib.licenses.unfree else lib.licenses.bsd3;

    maintainers = with lib.maintainers; [mdaiter basvandijk];

    platforms = with lib.platforms; linux ++ darwin;

  };

}