From 9cf29b7039fd31abda8c46b3f5807df1c12d6446 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 3 Feb 2014 18:10:38 -0500
Subject: [PATCH] llvm: Propagate ncurses and zlib

Really shouldn't be needed with shared libs, should patch llvm-config

Fixes #1601

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 pkgs/development/compilers/llvm/3.4/llvm.nix                | 3 +++
 pkgs/development/libraries/haskell/llvm-general/default.nix | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix
index 45c8b84178c4..d93bd4aba19b 100644
--- a/pkgs/development/compilers/llvm/3.4/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.4/llvm.nix
@@ -10,6 +10,7 @@
 , valgrind
 , ncurses
 , version
+, zlib
 }:
 
 let
@@ -27,6 +28,8 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [ perl groff cmake libxml2 python libffi ncurses ] ++ stdenv.lib.optional stdenv.isLinux valgrind;
 
+  propagatedBuildInputs = [ ncurses zlib ];
+
   # hacky fix: created binaries need to be run before installation
   preBuild = ''
     mkdir -p $out/
diff --git a/pkgs/development/libraries/haskell/llvm-general/default.nix b/pkgs/development/libraries/haskell/llvm-general/default.nix
index ef4677a2ffca..3206493eee39 100644
--- a/pkgs/development/libraries/haskell/llvm-general/default.nix
+++ b/pkgs/development/libraries/haskell/llvm-general/default.nix
@@ -15,7 +15,7 @@ cabal.mkDerivation (self: {
     HUnit llvmGeneralPure mtl QuickCheck testFramework
     testFrameworkHunit testFrameworkQuickcheck2
   ];
-  buildTools = [ llvmConfig ncurses zlib ];
+  buildTools = [ llvmConfig ];
   doCheck = false;
   meta = {
     description = "General purpose LLVM bindings";