From 6472ba3a88c6fce9fabeed0eb0d06d0dda64e383 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 15 Jul 2026 03:19:08 +0100 Subject: [PATCH] Revert "opencv: work around `ld64` hardening issue" The ld64 issue has been fixed. This reverts commit 8f2f727a6786bede3b45b2ae637dc0b88299306d. --- pkgs/development/libraries/opencv/4.x.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index a7412473707e..85163117298f 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -91,9 +91,6 @@ bzip2, callPackage, - - # TODO: Clean up on `staging`. - llvmPackages, }@inputs: let @@ -478,10 +475,6 @@ effectiveStdenv.mkDerivation { ) ++ optionals enableCuda [ cudaPackages.cuda_nvcc - ] - # TODO: Clean up on `staging`. - ++ optionals effectiveStdenv.hostPlatform.isDarwin [ - llvmPackages.lld ]; env = { @@ -572,10 +565,6 @@ effectiveStdenv.mkDerivation { ] ++ optionals (enabledModules != [ ]) [ (cmakeFeature "BUILD_LIST" (concatStringsSep "," enabledModules)) - ] - # TODO: Clean up on `staging`. - ++ optionals effectiveStdenv.hostPlatform.isDarwin [ - (cmakeFeature "CMAKE_LINKER_TYPE" "LLD") ]; postBuild = optionalString enableDocs ''