diff options
| author | Artturin <Artturin@artturin.com> | 2023-02-19 21:23:32 +0200 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2023-02-22 21:23:04 +0200 |
| commit | f9fdf2d4028eac28a074c9ad75d309b3dcbf8e7a (patch) | |
| tree | 01a46081dd6fc9d0a4c68be1c1844a8764bd8461 /pkgs/development/libraries/opencv | |
| parent | 6f6cc4a22db345c66bcb69c26469b0140ca3be44 (diff) | |
| download | nixpkgs-f9fdf2d4028eac28a074c9ad75d309b3dcbf8e7a.tar nixpkgs-f9fdf2d4028eac28a074c9ad75d309b3dcbf8e7a.tar.gz nixpkgs-f9fdf2d4028eac28a074c9ad75d309b3dcbf8e7a.tar.bz2 nixpkgs-f9fdf2d4028eac28a074c9ad75d309b3dcbf8e7a.tar.lz nixpkgs-f9fdf2d4028eac28a074c9ad75d309b3dcbf8e7a.tar.xz nixpkgs-f9fdf2d4028eac28a074c9ad75d309b3dcbf8e7a.tar.zst nixpkgs-f9fdf2d4028eac28a074c9ad75d309b3dcbf8e7a.zip | |
treewide: move NIX_CFLAGS_COMPILE to the env attrset
with structuredAttrs lists will be bash arrays which cannot be exported which will be a issue with some patches and some wrappers like cc-wrapper this makes it clearer that NIX_CFLAGS_COMPILE must be a string as lists in env cause a eval failure
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, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 59a74a66730..e1a13c9fe57 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -216,7 +216,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config unzip ]; - NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; + env.NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; # Configure can't find the library without this. OpenBLAS_HOME = lib.optionalString enableOpenblas openblas; diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 4a9af9a5388..ac021c2b610 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -307,7 +307,7 @@ stdenv.mkDerivation { pythonPackages.setuptools ]; - NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; + env.NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; # Configure can't find the library without this. OpenBLAS_HOME = lib.optionalString withOpenblas openblas_.dev; diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 73b0874dde5..059dc69df12 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config unzip ]; - NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; + env.NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; cmakeFlags = [ (opencvFlag "TIFF" enableTIFF) |