diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-06-07 21:26:33 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-06-07 21:27:19 +0300 |
| commit | 20f770d1f4fe892b101abf5735f0515a6918d2db (patch) | |
| tree | 1de436ba323c1abe28a3e0fe4bb4d1782b5047f5 | |
| parent | 78122285c801e26b6d52f0d9bef76936fec90c7a (diff) | |
| download | nixlib-20f770d1f4fe892b101abf5735f0515a6918d2db.tar nixlib-20f770d1f4fe892b101abf5735f0515a6918d2db.tar.gz nixlib-20f770d1f4fe892b101abf5735f0515a6918d2db.tar.bz2 nixlib-20f770d1f4fe892b101abf5735f0515a6918d2db.tar.lz nixlib-20f770d1f4fe892b101abf5735f0515a6918d2db.tar.xz nixlib-20f770d1f4fe892b101abf5735f0515a6918d2db.tar.zst nixlib-20f770d1f4fe892b101abf5735f0515a6918d2db.zip | |
opencv: propagate numpy dependency
| -rw-r--r-- | pkgs/development/libraries/opencv/3.x.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/opencv/default.nix | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index f6ec1be09492..187b6df39b2c 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ] - ++ lib.optionals enablePython [ pythonPackages.python pythonPackages.numpy ] + ++ lib.optional enablePython pythonPackages.python ++ lib.optional enableGtk2 gtk2 ++ lib.optional enableGtk3 gtk3 ++ lib.optional enableJPEG libjpeg @@ -76,6 +76,8 @@ stdenv.mkDerivation rec { ++ lib.optional enableEigen eigen ; + propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; + nativeBuildInputs = [ cmake pkgconfig unzip ]; NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase}/include/OpenEXR"; diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 82d597a17c9a..70ea306ae808 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ] + ++ lib.optional enablePython pythonPackages.python ++ lib.optional enableGtk2 gtk2 ++ lib.optional enableJPEG libjpeg ++ lib.optional enablePNG libpng @@ -41,6 +42,8 @@ stdenv.mkDerivation rec { ++ lib.optional enableEigen eigen ; + propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; + nativeBuildInputs = [ cmake pkgconfig unzip ]; NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase}/include/OpenEXR"; |