diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2018-07-28 19:25:14 +0200 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2018-07-28 19:25:14 +0200 |
| commit | f54b387b63299245092d9bbf09cb562bac125461 (patch) | |
| tree | 0c09809c0964d7bd931c6c8d1a7d19dcac342abd /pkgs/development/compilers/ghc/8.6.1.nix | |
| parent | 66d7126255b96a3d9c1cc0cdd7c2cd79d1789758 (diff) | |
| parent | 0fa2cbf59f7f68a8b9213a9cf9d2cd6dd2e518cc (diff) | |
| download | nixpkgs-f54b387b63299245092d9bbf09cb562bac125461.tar nixpkgs-f54b387b63299245092d9bbf09cb562bac125461.tar.gz nixpkgs-f54b387b63299245092d9bbf09cb562bac125461.tar.bz2 nixpkgs-f54b387b63299245092d9bbf09cb562bac125461.tar.lz nixpkgs-f54b387b63299245092d9bbf09cb562bac125461.tar.xz nixpkgs-f54b387b63299245092d9bbf09cb562bac125461.tar.zst nixpkgs-f54b387b63299245092d9bbf09cb562bac125461.zip | |
Merge remote-tracking branch 'central/master' into viric_clean
Diffstat (limited to 'pkgs/development/compilers/ghc/8.6.1.nix')
| -rw-r--r-- | pkgs/development/compilers/ghc/8.6.1.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix index ae22e1f1e40..8f0e5215217 100644 --- a/pkgs/development/compilers/ghc/8.6.1.nix +++ b/pkgs/development/compilers/ghc/8.6.1.nix @@ -32,6 +32,8 @@ ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross" }: +assert !enableIntegerSimple -> gmp != null; + let inherit (bootPkgs) ghc; @@ -46,8 +48,7 @@ let include mk/flavours/\$(BuildFlavour).mk endif DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} - '' + stdenv.lib.optionalString enableIntegerSimple '' - INTEGER_LIBRARY = integer-simple + INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} @@ -141,8 +142,8 @@ stdenv.mkDerivation (rec { configureFlags = [ "--datadir=$doc/share/doc/ghc" "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [ - "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" + ] ++ stdenv.lib.optional (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) [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ |