From 13deb3a2a1ad07779b7206ed4b25404556c9b774 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 13:58:26 -0700 Subject: [PATCH] opencv: remove with statements --- pkgs/development/libraries/opencv/3.x.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index adb6532bd682..01479f31116e 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -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; }; }