File tree 2 files changed +8
-2
lines changed
2 files changed +8
-2
lines changed Original file line number Diff line number Diff line change @@ -668,7 +668,7 @@ haskell-nix.haskellLib.makeCompilerDeps (stdenv.mkDerivation (rec {
668
668
'' ;
669
669
670
670
passthru = {
671
- inherit bootPkgs targetPrefix libDir llvmPackages enableShared useLLVM hadrian hadrianProject ;
671
+ inherit bootPkgs targetPrefix libDir llvmPackages enableShared enableTerminfo useLLVM hadrian hadrianProject ;
672
672
673
673
# Our Cabal compiler name
674
674
haskellCompilerName = "ghc-${ version } " ;
Original file line number Diff line number Diff line change 540
540
'' }
541
541
${ pkgs . lib . optionalString ( ! pkgs . stdenv . targetPlatform . isWindows ) ''
542
542
deps+=" $(jq -r '.components.lib."build-depends"[]|select(._if.not.os == "windows")|._then[]|.package' $json_cabal_file)"
543
- '' }
543
+ ''
544
+ # Fix problem with `haskeline` using a `terminfo` flag
545
+ # For haskell-nix ghc we can use ghc.enableTerminfo to get the flag setting
546
+ + pkgs . lib . optionalString ( name == "haskeline" && ! pkgs . stdenv . targetPlatform . isWindows && ghc . enableTerminfo or true ) ''
547
+ deps+=" terminfo"
548
+ ''
549
+ }
544
550
DEPS_${ varname name } ="$(tr '\n' ' ' <<< "$deps")"
545
551
VER_${ varname name } ="$(jq -r '.version' $json_cabal_file)"
546
552
PKGS+=" ${ name } "
You can’t perform that action at this time.
0 commit comments