diff options
| author | Shea Levy <shea@shealevy.com> | 2014-02-03 18:10:38 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2014-02-03 18:11:00 -0500 |
| commit | 9cf29b7039fd31abda8c46b3f5807df1c12d6446 (patch) | |
| tree | 2228e2cae7ebae17957ec80160f821d7e759fb62 /pkgs | |
| parent | 34638ebc1eaf7f43bf5902d16270d21894e45ec1 (diff) | |
| download | nixpkgs-9cf29b7039fd31abda8c46b3f5807df1c12d6446.tar nixpkgs-9cf29b7039fd31abda8c46b3f5807df1c12d6446.tar.gz nixpkgs-9cf29b7039fd31abda8c46b3f5807df1c12d6446.tar.bz2 nixpkgs-9cf29b7039fd31abda8c46b3f5807df1c12d6446.tar.lz nixpkgs-9cf29b7039fd31abda8c46b3f5807df1c12d6446.tar.xz nixpkgs-9cf29b7039fd31abda8c46b3f5807df1c12d6446.tar.zst nixpkgs-9cf29b7039fd31abda8c46b3f5807df1c12d6446.zip | |
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>
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/llvm/3.4/llvm.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/haskell/llvm-general/default.nix | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix index 45c8b84178c..d93bd4aba19 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 ef4677a2ffc..3206493eee3 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"; |