cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

ghc*-binary: Remove no-op --with-gmp-libraries

Browse source
This commit is contained in:
Niklas Hambüchen 2021-07-05 19:01:00 +02:00
parent 0044356dc7
commit 63b1e6e489
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/compilers/ghc/8.10.2-binary.nix
View file

@ -244,11 +244,9 @@ stdenv.mkDerivation rec {
configurePlatforms = [ ]; configurePlatforms = [ ];
configureFlags = [ 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" "--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.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"
# From: https://github.com/NixOS/nixpkgs/pull/43369/commits # From: https://github.com/NixOS/nixpkgs/pull/43369/commits
++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override";

3
pkgs/development/compilers/ghc/8.6.5-binary.nix
View file

@ -121,8 +121,9 @@ stdenv.mkDerivation rec {
configurePlatforms = [ ]; configurePlatforms = [ ];
configureFlags = [ configureFlags = [
"--with-gmp-libraries=${lib.getLib gmp}/lib"
"--with-gmp-includes=${lib.getDev gmp}/include" "--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.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"
++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override";