diff options
| author | Shea Levy <shea@shealevy.com> | 2014-02-02 20:36:50 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2014-02-02 20:36:50 -0500 |
| commit | 06ef22bcdd6ee60b33514ba314f3010863ad4d55 (patch) | |
| tree | 621d8650c181925e45dae0e9359f5a0d883fbd9f /pkgs | |
| parent | 86c587134b4af478047a520e7dc7d8af4f4a6998 (diff) | |
| download | nixpkgs-06ef22bcdd6ee60b33514ba314f3010863ad4d55.tar nixpkgs-06ef22bcdd6ee60b33514ba314f3010863ad4d55.tar.gz nixpkgs-06ef22bcdd6ee60b33514ba314f3010863ad4d55.tar.bz2 nixpkgs-06ef22bcdd6ee60b33514ba314f3010863ad4d55.tar.lz nixpkgs-06ef22bcdd6ee60b33514ba314f3010863ad4d55.tar.xz nixpkgs-06ef22bcdd6ee60b33514ba314f3010863ad4d55.tar.zst nixpkgs-06ef22bcdd6ee60b33514ba314f3010863ad4d55.zip | |
llvm-general: Fix build
Signed-off-by: Shea Levy <shea@shealevy.com>
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/haskell/llvm-general/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/libraries/haskell/llvm-general/default.nix b/pkgs/development/libraries/haskell/llvm-general/default.nix index 7749c47689e..ef4677a2ffc 100644 --- a/pkgs/development/libraries/haskell/llvm-general/default.nix +++ b/pkgs/development/libraries/haskell/llvm-general/default.nix @@ -1,6 +1,7 @@ { cabal, HUnit, llvmConfig, llvmGeneralPure, mtl, parsec , QuickCheck, setenv, testFramework, testFrameworkHunit , testFrameworkQuickcheck2, transformers, utf8String +, ncurses, zlib }: cabal.mkDerivation (self: { @@ -14,7 +15,7 @@ cabal.mkDerivation (self: { HUnit llvmGeneralPure mtl QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 ]; - buildTools = [ llvmConfig ]; + buildTools = [ llvmConfig ncurses zlib ]; doCheck = false; meta = { description = "General purpose LLVM bindings"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 22ed0295494..a2476139455 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1567,8 +1567,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ListZipper = callPackage ../development/libraries/haskell/ListZipper {}; llvmGeneral = callPackage ../development/libraries/haskell/llvm-general { - # !!! llvm-general pre-release supports 3.4... - llvmConfig = pkgs.llvm_33; + llvmConfig = pkgs.llvm; + inherit (pkgs) zlib ncurses; }; llvmGeneralPure = callPackage ../development/libraries/haskell/llvm-general-pure {}; |