mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-20 15:41:16 +00:00
Revert "opencv: work around ld64 hardening issue"
The ld64 issue has been fixed.
This reverts commit 8f2f727a67.
This commit is contained in:
@@ -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 ''
|
||||
|
||||
Reference in New Issue
Block a user