public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ghc: propagate 'gmp' and 'ncurses' to ensure users can link the 'haskeline' library, etc.

Browse Source 
Fixes https://github.com/NixOS/nixpkgs/issues/5616.
This commit is contained in:
Peter Simons
2015-01-14 11:24:59 +01:00
parent a92afcd34a
commit a8076c7654
19 changed files with 37 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+2 -2
View File
@@ -16,7 +16,7 @@ self: super: {
directory = null;
filepath = null;
ghc-prim = null;
haskeline = self.haskeline_0_7_1_3; # GHC's version is broken: https://github.com/NixOS/nixpkgs/issues/5616.
haskeline = null;
haskell2010 = null;
haskell98 = null;
hoopl = null;
@@ -28,7 +28,7 @@ self: super: {
process = null;
rts = null;
template-haskell = null;
terminfo = self.terminfo_0_4_0_0; # GHC's version is broken: https://github.com/NixOS/nixpkgs/issues/5616.
terminfo = null;
time = null;
unix = null;
pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+2 -2
View File
@@ -16,7 +16,7 @@ self: super: {
directory = null;
filepath = null;
ghc-prim = null;
haskeline = self.haskeline_0_7_1_3; # GHC's version is broken: https://github.com/NixOS/nixpkgs/issues/5616.
haskeline = null;
haskell2010 = null;
haskell98 = null;
hoopl = null;
@@ -28,7 +28,7 @@ self: super: {
process = null;
rts = null;
template-haskell = null;
terminfo = self.terminfo_0_4_0_0; # GHC's version is broken: https://github.com/NixOS/nixpkgs/issues/5616.
terminfo = null;
time = null;
transformers = null;
unix = null;
pkgs/development/haskell-modules/generic-builder.nix
+1 -1
View File
@@ -129,7 +129,7 @@ stdenv.mkDerivation ({
mkdir -p $packageConfDir
local inputClosure=""
for i in $propagatedNativeBuildInputs $nativeBuildInputs; do
for i in $propagatedNativeBuildInputs $nativeBuildInputs ${ghc}; do
findInputs $i inputClosure propagated-native-build-inputs
done
for p in $inputClosure; do