diff options
| author | Niklas Hambüchen <mail@nh2.me> | 2021-07-05 19:01:00 +0200 |
|---|---|---|
| committer | Niklas Hambüchen <mail@nh2.me> | 2021-07-10 02:49:42 +0200 |
| commit | 63b1e6e48990c01ce0dcfbceb850047a2c24cbda (patch) | |
| tree | 6f0677c034a5bb5fbe0c64aaded723d80296d141 /pkgs/development/compilers | |
| parent | 0044356dc7b53fbafb78ceb17cec05e293c70940 (diff) | |
| download | nixpkgs-63b1e6e48990c01ce0dcfbceb850047a2c24cbda.tar nixpkgs-63b1e6e48990c01ce0dcfbceb850047a2c24cbda.tar.gz nixpkgs-63b1e6e48990c01ce0dcfbceb850047a2c24cbda.tar.bz2 nixpkgs-63b1e6e48990c01ce0dcfbceb850047a2c24cbda.tar.lz nixpkgs-63b1e6e48990c01ce0dcfbceb850047a2c24cbda.tar.xz nixpkgs-63b1e6e48990c01ce0dcfbceb850047a2c24cbda.tar.zst nixpkgs-63b1e6e48990c01ce0dcfbceb850047a2c24cbda.zip | |
ghc*-binary: Remove no-op `--with-gmp-libraries`
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/ghc/8.10.2-binary.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/8.6.5-binary.nix | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/development/compilers/ghc/8.10.2-binary.nix b/pkgs/development/compilers/ghc/8.10.2-binary.nix index 616b2894bb3..3ef4ebb9b98 100644 --- a/pkgs/development/compilers/ghc/8.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.2-binary.nix @@ -244,11 +244,9 @@ stdenv.mkDerivation rec { configurePlatforms = [ ]; configureFlags = [ - # Note that musl-based bindists seem to do nothing with the - # `--with-gmp-libraries` flag, see: - # https://gitlab.haskell.org/ghc/ghc/-/issues/20073#note_363231 - "--with-gmp-libraries=${lib.getLib gmp}/lib" "--with-gmp-includes=${lib.getDev gmp}/include" + # Note `--with-gmp-libraries` does nothing for GHC bindists: + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6124 ] ++ lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" # From: https://github.com/NixOS/nixpkgs/pull/43369/commits ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; diff --git a/pkgs/development/compilers/ghc/8.6.5-binary.nix b/pkgs/development/compilers/ghc/8.6.5-binary.nix index 42b60ec3231..c3d6ab1beca 100644 --- a/pkgs/development/compilers/ghc/8.6.5-binary.nix +++ b/pkgs/development/compilers/ghc/8.6.5-binary.nix @@ -121,8 +121,9 @@ stdenv.mkDerivation rec { configurePlatforms = [ ]; configureFlags = [ - "--with-gmp-libraries=${lib.getLib gmp}/lib" "--with-gmp-includes=${lib.getDev gmp}/include" + # Note `--with-gmp-libraries` does nothing for GHC bindists: + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6124 ] ++ lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; |