From 45f652ce1ba28a9ad56533a6db7d2d771738118c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 4 Oct 2005 20:16:33 +0000 Subject: [PATCH] * Pass readline and ncurses to the source-built ghc as well. svn path=/nixpkgs/trunk/; revision=4013 --- pkgs/development/compilers/ghc/default.nix | 3 ++- pkgs/system/all-packages-generic.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghc/default.nix b/pkgs/development/compilers/ghc/default.nix index b26a5154bf6..cac79fd92bb 100644 --- a/pkgs/development/compilers/ghc/default.nix +++ b/pkgs/development/compilers/ghc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl, ghc, m4}: +{stdenv, fetchurl, perl, ghc, m4, readline, ncurses}: stdenv.mkDerivation { name = "ghc-6.4.1"; @@ -7,4 +7,5 @@ stdenv.mkDerivation { md5 = "fd289bc7c3afa272ff831a71a50b5b00"; }; buildInputs = [perl ghc m4]; + propagatedBuildInputs = [readline ncurses]; } diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 9839878e0e1..749a59d860c 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -563,7 +563,7 @@ rec { }; ghc = (import ../development/compilers/ghc) { - inherit fetchurl stdenv perl; + inherit fetchurl stdenv perl ncurses readline; ghc = ghcboot; m4 = gnum4; };