diff options
| author | Gabor Greif <ggreif@gmail.com> | 2020-03-24 22:51:50 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2020-03-27 20:56:41 +0100 |
| commit | f6d2dce2bf911f76abb2407a65a654da84c82800 (patch) | |
| tree | 297a6bf84a69f36a069cab41312461bb7de1305f /pkgs/development/compilers | |
| parent | 3c7ef6bcd85e3e133ac6f2ab5e238934d56d902e (diff) | |
| download | nixpkgs-f6d2dce2bf911f76abb2407a65a654da84c82800.tar nixpkgs-f6d2dce2bf911f76abb2407a65a654da84c82800.tar.gz nixpkgs-f6d2dce2bf911f76abb2407a65a654da84c82800.tar.bz2 nixpkgs-f6d2dce2bf911f76abb2407a65a654da84c82800.tar.lz nixpkgs-f6d2dce2bf911f76abb2407a65a654da84c82800.tar.xz nixpkgs-f6d2dce2bf911f76abb2407a65a654da84c82800.tar.zst nixpkgs-f6d2dce2bf911f76abb2407a65a654da84c82800.zip | |
ghc-8.10.1: reformat to minimize diff with 8.8.3.nix
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/ghc/8.10.1.nix | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/development/compilers/ghc/8.10.1.nix b/pkgs/development/compilers/ghc/8.10.1.nix index dba715285b1..9198d08cef4 100644 --- a/pkgs/development/compilers/ghc/8.10.1.nix +++ b/pkgs/development/compilers/ghc/8.10.1.nix @@ -149,15 +149,21 @@ stdenv.mkDerivation (rec { # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + # `--with` flags for libraries needed for RTS linker configureFlags = [ "--datadir=$doc/share/doc/ghc" "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ stdenv.lib.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" + ] ++ stdenv.lib.optionals (libffi != null) [ + "--with-system-libffi" + "--with-ffi-includes=${targetPackages.libffi.dev}/include" + "--with-ffi-libraries=${targetPackages.libffi.out}/lib" ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [ - "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" + "--with-gmp-includes=${targetPackages.gmp.dev}/include" + "--with-gmp-libraries=${targetPackages.gmp.out}/lib" ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ - "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" + "--with-iconv-includes=${libiconv}/include" + "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" ] ++ stdenv.lib.optionals useLdGold [ |