From c1c3317f6518acea4e02a8d5acfcb84fddb6696f Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 17 Feb 2012 18:50:29 +0000 Subject: [PATCH] vigra: fix install svn path=/nixpkgs/trunk/; revision=32362 --- pkgs/development/libraries/vigra/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 93ed2869d0e..83b921dd49b 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -11,10 +11,9 @@ stdenv.mkDerivation rec { buildInputs = [ cmake fftw fftwSinglePrec libtiff libpng libjpeg python boost numpy hdf5 ]; - cmakeFlags = if (stdenv.system == "x86_64-linux") then - "-DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_C_FLAGS=-fPIC" - else - ""; + preConfigure = "cmakeFlags+=\" -DVIGRANUMPY_INSTALL_DIR=$out/lib/${python.libPrefix}/site-packages\""; + cmakeFlags = stdenv.lib.optionals (stdenv.system == "x86_64-linux") + [ "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC" ]; meta = { description = "Novel computer vision C++ library with customizable algorithms and data structures";