public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

opencv: propagate numpy dependency

This commit is contained in:
Nikolay Amiantov 2016-06-07 21:26:33 +03:00
parent 78122285c8
commit 20f770d1f4
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/opencv/3.x.nix
View File

@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ zlib ] [ zlib ]
++ lib.optionals enablePython [ pythonPackages.python pythonPackages.numpy ] ++ lib.optional enablePython pythonPackages.python
++ lib.optional enableGtk2 gtk2 ++ lib.optional enableGtk2 gtk2
++ lib.optional enableGtk3 gtk3 ++ lib.optional enableGtk3 gtk3
++ lib.optional enableJPEG libjpeg ++ lib.optional enableJPEG libjpeg
@ -76,6 +76,8 @@ stdenv.mkDerivation rec {
++ lib.optional enableEigen eigen ++ lib.optional enableEigen eigen
; ;
propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;
nativeBuildInputs = [ cmake pkgconfig unzip ]; nativeBuildInputs = [ cmake pkgconfig unzip ];
NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase}/include/OpenEXR"; NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase}/include/OpenEXR";

3
pkgs/development/libraries/opencv/default.nix
View File

@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ zlib ] [ zlib ]
++ lib.optional enablePython pythonPackages.python
++ lib.optional enableGtk2 gtk2 ++ lib.optional enableGtk2 gtk2
++ lib.optional enableJPEG libjpeg ++ lib.optional enableJPEG libjpeg
++ lib.optional enablePNG libpng ++ lib.optional enablePNG libpng
@ -41,6 +42,8 @@ stdenv.mkDerivation rec {
++ lib.optional enableEigen eigen ++ lib.optional enableEigen eigen
; ;
propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;
nativeBuildInputs = [ cmake pkgconfig unzip ]; nativeBuildInputs = [ cmake pkgconfig unzip ];
NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase}/include/OpenEXR"; NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase}/include/OpenEXR";