diff options
| author | Gabor Greif <ggreif@gmail.com> | 2020-04-11 11:53:01 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2020-04-24 21:48:28 +0200 |
| commit | daf79ea7c7f874623e7e5ef953e7c342e6923ee3 (patch) | |
| tree | 1caae4b3ebf7dec8b131fd1c7d3511774e95a9f6 | |
| parent | 0e82313c07d2894e67b6729d7158a761c80fe648 (diff) | |
| download | nixlib-daf79ea7c7f874623e7e5ef953e7c342e6923ee3.tar nixlib-daf79ea7c7f874623e7e5ef953e7c342e6923ee3.tar.gz nixlib-daf79ea7c7f874623e7e5ef953e7c342e6923ee3.tar.bz2 nixlib-daf79ea7c7f874623e7e5ef953e7c342e6923ee3.tar.lz nixlib-daf79ea7c7f874623e7e5ef953e7c342e6923ee3.tar.xz nixlib-daf79ea7c7f874623e7e5ef953e7c342e6923ee3.tar.zst nixlib-daf79ea7c7f874623e7e5ef953e7c342e6923ee3.zip | |
compilers/ghc: apply structuredAttrs patch to other ghcs
Ported from: > [haskell-updates c8aa9864405] ghc883: fix structuredAttrs build > Author: Robin Gloster <mail@glob.in> > Date: Sat Apr 4 19:21:31 2020 +0200 > 1 file changed, 3 insertions(+), 3 deletions(-)
| -rw-r--r-- | pkgs/development/compilers/ghc/8.10.1.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/8.8.2.nix | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/compilers/ghc/8.10.1.nix b/pkgs/development/compilers/ghc/8.10.1.nix index 2421e80bfbd9..cacff5bfcfdf 100644 --- a/pkgs/development/compilers/ghc/8.10.1.nix +++ b/pkgs/development/compilers/ghc/8.10.1.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; @@ -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) [ diff --git a/pkgs/development/compilers/ghc/8.8.2.nix b/pkgs/development/compilers/ghc/8.8.2.nix index bf169a24c6a2..4cc41620c2db 100644 --- a/pkgs/development/compilers/ghc/8.8.2.nix +++ b/pkgs/development/compilers/ghc/8.8.2.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; @@ -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) [ |