From 9a8c52cf41858f8c8076e3ee0a52fa1d32a62dbc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Oct 2011 18:26:02 +0000 Subject: [PATCH] haskell-hmatrix: enable -fvector flag svn path=/nixpkgs/trunk/; revision=29907 --- pkgs/development/libraries/haskell/hmatrix/default.nix | 1 + pkgs/top-level/haskell-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix index 43c66c3d894..5f45d99c75c 100644 --- a/pkgs/development/libraries/haskell/hmatrix/default.nix +++ b/pkgs/development/libraries/haskell/hmatrix/default.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { binary HUnit QuickCheck random storableComplex vector ]; extraLibraries = [ blas gsl liblapack ]; + configureFlags = "-fvector"; meta = { homepage = "http://perception.inf.um.es/hmatrix"; description = "Linear algebra and numerical computation"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index fc834042dbc..0f2f551af56 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -744,9 +744,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HList = callPackage ../development/libraries/haskell/HList {}; - hmatrix = callPackage ../development/libraries/haskell/hmatrix { - vector = self.vector_0_7_1; - }; + hmatrix = callPackage ../development/libraries/haskell/hmatrix {}; hopenssl = callPackage ../development/libraries/haskell/hopenssl {};