From cd018e50d43d29587a5211e82ff8dc7f49a5743f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Thu, 23 Apr 2009 17:21:14 +0000
Subject: [PATCH] 64bit support in Cabal builder

svn path=/nixpkgs/trunk/; revision=15282
---
 pkgs/development/libraries/haskell/cabal/cabal.nix | 2 +-
 pkgs/top-level/haskell-packages.nix                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/cabal/cabal.nix b/pkgs/development/libraries/haskell/cabal/cabal.nix
index cac8990d271f..c0dea9976839 100644
--- a/pkgs/development/libraries/haskell/cabal/cabal.nix
+++ b/pkgs/development/libraries/haskell/cabal/cabal.nix
@@ -37,7 +37,7 @@ attrs :
             propagatedBuildInputs = [];
 
             # library directories that have to be added to the Cabal files
-            extraLibDirs = map (x : x + "/lib") self.propagatedBuildInputs;
+            extraLibDirs = attrs.lib.lists.concatMap (x : [ (x + "/lib64") (x + "/lib") ]) self.propagatedBuildInputs;
 
             # compiles Setup and configures
             configurePhase = ''
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index d9ab86a6d77d..d13141ca9322 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -16,7 +16,7 @@ rec {
   };
 
   cabal = import ../development/libraries/haskell/cabal/cabal.nix {
-    inherit (pkgs) stdenv fetchurl;
+    inherit (pkgs) stdenv fetchurl lib;
     inherit ghc;
   };