about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2010-10-14 15:44:58 +0000
committerMichael Raskin <7c6f434c@mail.ru>2010-10-14 15:44:58 +0000
commite958760535cca4db4623e0169981c40fa778507a (patch)
treebd846c2dcacceda23ceb0d435182363a157363cb
parent798a6bb103d37c025d9477550b16528acd9cf3a1 (diff)
downloadnixlib-e958760535cca4db4623e0169981c40fa778507a.tar
nixlib-e958760535cca4db4623e0169981c40fa778507a.tar.gz
nixlib-e958760535cca4db4623e0169981c40fa778507a.tar.bz2
nixlib-e958760535cca4db4623e0169981c40fa778507a.tar.lz
nixlib-e958760535cca4db4623e0169981c40fa778507a.tar.xz
nixlib-e958760535cca4db4623e0169981c40fa778507a.tar.zst
nixlib-e958760535cca4db4623e0169981c40fa778507a.zip
Applying some patches from Debian to build it with fresh OpenCV
svn path=/nixpkgs/trunk/; revision=24292
-rw-r--r--pkgs/tools/graphics/qrdecode/default.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/tools/graphics/qrdecode/default.nix b/pkgs/tools/graphics/qrdecode/default.nix
index 9f62bac90045..16c91720964a 100644
--- a/pkgs/tools/graphics/qrdecode/default.nix
+++ b/pkgs/tools/graphics/qrdecode/default.nix
@@ -25,6 +25,9 @@ rec {
   preConfigure = fullDepEntry ''
     cd src
     sed -e /LDCONFIG/d -i libdecodeqr/Makefile.in
+    sed -e '/#include <cv.h>/a#include <ml.h>' -i libdecodeqr/imagereader.h
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${args.opencv}/include/opencv"
+    export NIX_LDFLAGS="$NIX_LDFLAGS -lcxcore"
   '' ["doUnpack"];
   postInstall = fullDepEntry ''
     cp sample/simple/simpletest $out/bin/qrdecode