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

opencv 2.1: fixing the build

Browse Source 
Related to libpng versions, and the gcc change (ptrdiff_t vs std::ptrdiff_t)
This commit is contained in:
Lluís Batlle i Rossell 2012-07-02 20:18:48 +02:00
parent 6389fcdbde
commit cace272941
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/opencv/2.1.nix
View File

@ -9,11 +9,17 @@ stdenv.mkDerivation rec {
sha256 = "26061fd52ab0ab593c093ff94b5f5c09b956d7deda96b47019ff11932111397f"; 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 ]; xineLib gstreamer ];
enableParallelBuilding = true; enableParallelBuilding = true;
patchPhase = ''
sed -i 's/ptrdiff_t/std::ptrdiff_t/' include/opencv/*
'';
preConfigure = '' preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -D__STDC_CONSTANT_MACROS " export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -D__STDC_CONSTANT_MACROS "
''; '';