From 63b1e6e48990c01ce0dcfbceb850047a2c24cbda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Mon, 5 Jul 2021 19:01:00 +0200 Subject: [PATCH] ghc*-binary: Remove no-op `--with-gmp-libraries` --- pkgs/development/compilers/ghc/8.10.2-binary.nix | 6 ++---- 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 616b2894bb3b6..3ef4ebb9b98f7 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 42b60ec32312b..c3d6ab1beca2f 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";