alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

llvm-general: Fix build

Browse source 
Signed-off-by: Shea Levy <shea@shealevy.com>
This commit is contained in:
Shea Levy 2014-02-02 20:36:50 -05:00
parent 86c587134b
commit 06ef22bcdd
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/libraries/haskell/llvm-general/default.nix
View file

@ -1,6 +1,7 @@
{ cabal, HUnit, llvmConfig, llvmGeneralPure, mtl, parsec { cabal, HUnit, llvmConfig, llvmGeneralPure, mtl, parsec
, QuickCheck, setenv, testFramework, testFrameworkHunit , QuickCheck, setenv, testFramework, testFrameworkHunit
, testFrameworkQuickcheck2, transformers, utf8String , testFrameworkQuickcheck2, transformers, utf8String
, ncurses, zlib
}: }:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
@ -14,7 +15,7 @@ cabal.mkDerivation (self: {
HUnit llvmGeneralPure mtl QuickCheck testFramework HUnit llvmGeneralPure mtl QuickCheck testFramework
testFrameworkHunit testFrameworkQuickcheck2 testFrameworkHunit testFrameworkQuickcheck2
]; ];
buildTools = [ llvmConfig ]; buildTools = [ llvmConfig ncurses zlib ];
doCheck = false; doCheck = false;
meta = { meta = {
description = "General purpose LLVM bindings"; description = "General purpose LLVM bindings";

4
pkgs/top-level/haskell-packages.nix
View file

@ -1567,8 +1567,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
ListZipper = callPackage ../development/libraries/haskell/ListZipper {}; ListZipper = callPackage ../development/libraries/haskell/ListZipper {};
llvmGeneral = callPackage ../development/libraries/haskell/llvm-general { llvmGeneral = callPackage ../development/libraries/haskell/llvm-general {
# !!! llvm-general pre-release supports 3.4... llvmConfig = pkgs.llvm;
llvmConfig = pkgs.llvm_33; inherit (pkgs) zlib ncurses;
}; };
llvmGeneralPure = callPackage ../development/libraries/haskell/llvm-general-pure {}; llvmGeneralPure = callPackage ../development/libraries/haskell/llvm-general-pure {};