mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 06:31:02 +00:00
64bit support in Cabal builder
svn path=/nixpkgs/trunk/; revision=15282
This commit is contained in:
parent
2c2f0d913c
commit
cd018e50d4
|
@ -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 = ''
|
||||
|
|
|
@ -16,7 +16,7 @@ rec {
|
|||
};
|
||||
|
||||
cabal = import ../development/libraries/haskell/cabal/cabal.nix {
|
||||
inherit (pkgs) stdenv fetchurl;
|
||||
inherit (pkgs) stdenv fetchurl lib;
|
||||
inherit ghc;
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue