From 423a36f9907137f8dba316532d9656b427507f39 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 7 Jun 2016 17:18:56 +0300 Subject: [PATCH] opencv: add version with Python support to pythonPackages --- pkgs/top-level/python-packages.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2d375ec9de9..d52e2ddeec0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4062,6 +4062,16 @@ in modules // { }; }; + opencv = pkgs.opencv.override { + enablePython = true; + pythonPackages = self; + }; + + opencv3 = pkgs.opencv3.override { + enablePython = true; + pythonPackages = self; + }; + openstackclient = buildPythonPackage rec { name = "openstackclient-${version}"; version = "1.7.1"; @@ -25954,13 +25964,7 @@ in modules // { # thumborPexif pexif libthumbor - (pkgs.opencv.override { - gtk = null; - glib = null; - xineLib = null; - gstreamer = null; - ffmpeg = null; - }) + opencv ] ++ optionals (!isPy3k) [ futures ]; src = pkgs.fetchurl {