diff --git a/pkgs/development/libraries/opencv/2.1.nix b/pkgs/development/libraries/opencv/2.1.nix index 6f422463db9..ea5b1313dc7 100644 --- a/pkgs/development/libraries/opencv/2.1.nix +++ b/pkgs/development/libraries/opencv/2.1.nix @@ -9,11 +9,17 @@ stdenv.mkDerivation rec { sha256 = "26061fd52ab0ab593c093ff94b5f5c09b956d7deda96b47019ff11932111397f"; }; - buildInputs = [ cmake gtk glib libjpeg libpng libtiff jasper ffmpeg pkgconfig + # The order is important; libpng should go before X libs, because they + # propagate the libpng 1.5 (and opencv wants libpng 1.2) + buildInputs = [ cmake libpng gtk glib libjpeg libtiff jasper ffmpeg pkgconfig xineLib gstreamer ]; enableParallelBuilding = true; + patchPhase = '' + sed -i 's/ptrdiff_t/std::ptrdiff_t/' include/opencv/* + ''; + preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -D__STDC_CONSTANT_MACROS " '';