Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d1fe125037ed
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dd9a1fe3c4e5
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 1, 2021

  1. ghc-9.0.1: set utf-8 locale during the build so that Haddock succeeds

    @peti
    peti committed Jan 1, 2021
    Copy the full SHA
    dd9a1fe View commit details
Showing with 6 additions and 0 deletions.
  1. +6 −0 pkgs/development/compilers/ghc/9.0.1.nix
6 changes: 6 additions & 0 deletions pkgs/development/compilers/ghc/9.0.1.nix
View file
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@
, bash

, libiconv ? null, ncurses
, glibcLocales ? null

, # GHC can be built with system libffi or a bundled one.
libffi ? null
@@ -109,6 +110,9 @@ stdenv.mkDerivation (rec {

postPatch = "patchShebangs .";

# GHC needs the locale configured during the Haddock phase.
LANG = "en_US.UTF-8";

# GHC is a bit confused on its cross terminology.
preConfigure = ''
for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
@@ -129,6 +133,8 @@ stdenv.mkDerivation (rec {
echo -n "${buildMK}" > mk/build.mk
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
'' + stdenv.lib.optionalString (stdenv.isLinux) ''
export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive"
'' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
'' + stdenv.lib.optionalString stdenv.isDarwin ''