pyrox.dev
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(-)
authored by
Gabor Greif
and committed by
Peter Simons
daf79ea7
0e82313c
+3
-3
pkgs/development/compilers/ghc/8.10.1.nix
+3
-3
pkgs/development/compilers/ghc/8.10.1.nix
···
73
73
'';
74
74
75
75
# Splicer will pull out correct variations
76
-
libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
76
+
libDeps = platform: stdenv.lib.optional enableTerminfo ncurses
77
77
++ [libffi]
78
78
++ stdenv.lib.optional (!enableIntegerSimple) gmp
79
79
++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
···
160
160
"--with-system-libffi"
161
161
"--with-ffi-includes=${targetPackages.libffi.dev}/include"
162
162
"--with-ffi-libraries=${targetPackages.libffi.out}/lib"
163
-
] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [
163
+
] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
164
164
"--with-gmp-includes=${targetPackages.gmp.dev}/include"
165
165
"--with-gmp-libraries=${targetPackages.gmp.out}/lib"
166
-
] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
166
+
] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
167
167
"--with-iconv-includes=${libiconv}/include"
168
168
"--with-iconv-libraries=${libiconv}/lib"
169
169
] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
+3
-3
pkgs/development/compilers/ghc/8.8.2.nix
+3
-3
pkgs/development/compilers/ghc/8.8.2.nix
···
73
73
'';
74
74
75
75
# Splicer will pull out correct variations
76
-
libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
76
+
libDeps = platform: stdenv.lib.optional enableTerminfo ncurses
77
77
++ [libffi]
78
78
++ stdenv.lib.optional (!enableIntegerSimple) gmp
79
79
++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
···
160
160
"--with-system-libffi"
161
161
"--with-ffi-includes=${targetPackages.libffi.dev}/include"
162
162
"--with-ffi-libraries=${targetPackages.libffi.out}/lib"
163
-
] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [
163
+
] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
164
164
"--with-gmp-includes=${targetPackages.gmp.dev}/include"
165
165
"--with-gmp-libraries=${targetPackages.gmp.out}/lib"
166
-
] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
166
+
] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
167
167
"--with-iconv-includes=${libiconv}/include"
168
168
"--with-iconv-libraries=${libiconv}/lib"
169
169
] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [