diff options
| author | Robin Gloster <mail@glob.in> | 2020-04-04 19:21:31 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-05 13:06:57 +0200 |
| commit | fb015f809a2614bccad7b45e3f9d6f8462c52f72 (patch) | |
| tree | 476baef3d2534c9b8f24ae08ff2680bb79fa988a | |
| parent | f91b34e53e7c2be57acdf2ad62715454f62ded04 (diff) | |
| download | nixlib-fb015f809a2614bccad7b45e3f9d6f8462c52f72.tar nixlib-fb015f809a2614bccad7b45e3f9d6f8462c52f72.tar.gz nixlib-fb015f809a2614bccad7b45e3f9d6f8462c52f72.tar.bz2 nixlib-fb015f809a2614bccad7b45e3f9d6f8462c52f72.tar.lz nixlib-fb015f809a2614bccad7b45e3f9d6f8462c52f72.tar.xz nixlib-fb015f809a2614bccad7b45e3f9d6f8462c52f72.tar.zst nixlib-fb015f809a2614bccad7b45e3f9d6f8462c52f72.zip | |
ghc883: fix structuredAttrs build
| -rw-r--r-- | pkgs/development/compilers/ghc/8.8.3.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/compilers/ghc/8.8.3.nix b/pkgs/development/compilers/ghc/8.8.3.nix index e4ece9b8d8c1..237b03080f51 100644 --- a/pkgs/development/compilers/ghc/8.8.3.nix +++ b/pkgs/development/compilers/ghc/8.8.3.nix @@ -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; @@ -158,10 +158,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) [ |