diff options
| author | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-03 16:43:56 +0700 |
|---|---|---|
| committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-03 18:37:40 +0700 |
| commit | 3ae5e6ce03f9dbf3f0a0a3e3161c83e28c1b45af (patch) | |
| tree | e1ef883cca4049653aabfc8409cd6e7d51f1de92 /pkgs/development/libraries/opencv | |
| parent | fb2311d4307f9873ccd38c7f080fbf1df8f17daa (diff) | |
| download | nixpkgs-3ae5e6ce03f9dbf3f0a0a3e3161c83e28c1b45af.tar nixpkgs-3ae5e6ce03f9dbf3f0a0a3e3161c83e28c1b45af.tar.gz nixpkgs-3ae5e6ce03f9dbf3f0a0a3e3161c83e28c1b45af.tar.bz2 nixpkgs-3ae5e6ce03f9dbf3f0a0a3e3161c83e28c1b45af.tar.lz nixpkgs-3ae5e6ce03f9dbf3f0a0a3e3161c83e28c1b45af.tar.xz nixpkgs-3ae5e6ce03f9dbf3f0a0a3e3161c83e28c1b45af.tar.zst nixpkgs-3ae5e6ce03f9dbf3f0a0a3e3161c83e28c1b45af.zip | |
treewide: remove enableParallelBuilding = true if using cmake
Diffstat (limited to 'pkgs/development/libraries/opencv')
| -rw-r--r-- | pkgs/development/libraries/opencv/3.x.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/opencv/4.x.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/opencv/default.nix | 2 |
3 files changed, 0 insertions, 6 deletions
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 2ad2d016c9f..a861591f85f 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -245,8 +245,6 @@ stdenv.mkDerivation { "-DEIGEN_INCLUDE_PATH=${eigen}/include/eigen3" ]; - enableParallelBuilding = true; - postBuild = lib.optionalString enableDocs '' make doxygen ''; diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index c6547f118d0..0d225127dd8 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -253,8 +253,6 @@ stdenv.mkDerivation { "-DOPENCV_SKIP_PYTHON_LOADER=ON" ]; - enableParallelBuilding = true; - postBuild = lib.optionalString enableDocs '' make doxygen ''; diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 56414cfa397..055377b09f5 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -69,8 +69,6 @@ stdenv.mkDerivation rec { (opencvFlag "GSTREAMER" enableGStreamer) ]; - enableParallelBuilding = true; - hardeningDisable = [ "bindnow" "relro" ]; # Fix pkgconfig file that gets broken with multiple outputs |