diff options
| author | Katharina Fey <kookie@spacekookie.de> | 2020-05-20 01:39:43 +0200 |
|---|---|---|
| committer | Katharina Fey <kookie@spacekookie.de> | 2020-05-20 01:39:43 +0200 |
| commit | 1849de11ec1e32e9eebb83f24d5339bea88b7ed7 (patch) | |
| tree | 0aaf3cead09c2d55c67c6f6a86ad20af399797d8 /nixpkgs/pkgs/development/compilers/ghc/8.10.1.nix | |
| parent | 304c06d7a7ea3f5c84031d325ece8d38b8c1d829 (diff) | |
| parent | 0f5ce2fac0c726036ca69a5524c59a49e2973dd4 (diff) | |
Merge commit '0f5ce2fac0c726036ca69a5524c59a49e2973dd4'
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/ghc/8.10.1.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/ghc/8.10.1.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.10.1.nix b/nixpkgs/pkgs/development/compilers/ghc/8.10.1.nix index 01e10b04d27..c70efe1fdef 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/8.10.1.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/8.10.1.nix @@ -27,7 +27,7 @@ # platform). Static libs are always built. enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt -, # Whetherto build terminfo. +, # Whether to build terminfo. enableTerminfo ? !stdenv.targetPlatform.isWindows , # What flavour to build. An empty string indicates no @@ -73,7 +73,7 @@ let ''; # Splicer will pull out correct variations - libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] + libDeps = platform: stdenv.lib.optional enableTerminfo ncurses ++ [libffi] ++ stdenv.lib.optional (!enableIntegerSimple) gmp ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; @@ -160,10 +160,10 @@ stdenv.mkDerivation (rec { "--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [ + ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ @@ -176,7 +176,7 @@ stdenv.mkDerivation (rec { "--disable-large-address-space" ]; - # Make sure we never relax`$PATH` and hooks support for compatability. + # Make sure we never relax`$PATH` and hooks support for compatibility. strictDeps = true; # Donβt add -liconv to LDFLAGS automatically so that GHC will add it itself. |