diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-12-31 03:59:58 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-31 03:59:58 +0100 |
| commit | 0c2adc0fb1b0b551bef119477f37b86190cd9cc5 (patch) | |
| tree | f0fe93cd1157d2f0ef8f2cb052c48124f866386b /pkgs/development/libraries/opencv/3.x.nix | |
| parent | d6136b744a75e641d58d56115b1972b7dd1f4884 (diff) | |
| parent | c5406e30b02df521e75c4f5b7de62be322b05810 (diff) | |
| download | nixlib-0c2adc0fb1b0b551bef119477f37b86190cd9cc5.tar nixlib-0c2adc0fb1b0b551bef119477f37b86190cd9cc5.tar.gz nixlib-0c2adc0fb1b0b551bef119477f37b86190cd9cc5.tar.bz2 nixlib-0c2adc0fb1b0b551bef119477f37b86190cd9cc5.tar.lz nixlib-0c2adc0fb1b0b551bef119477f37b86190cd9cc5.tar.xz nixlib-0c2adc0fb1b0b551bef119477f37b86190cd9cc5.tar.zst nixlib-0c2adc0fb1b0b551bef119477f37b86190cd9cc5.zip | |
Merge branch 'staging' into staging-next
Diffstat (limited to 'pkgs/development/libraries/opencv/3.x.nix')
| -rw-r--r-- | pkgs/development/libraries/opencv/3.x.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 97df84637ef7..642facf166a6 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -208,7 +208,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkgconfig unzip ]; - NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase.dev}/include/OpenEXR"; + 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; |