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: 64bc63d86821
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3e02e7f49bf1
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 4, 2019

  1. ghc863: dont add extra libs 

    Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.

Merged in pull request #56795 from @matthewbauer.
    @matthewbauer
    matthewbauer committed Mar 4, 2019
    Copy the full SHA
    906d432 View commit details

  2. ghc843: dont add -liconv to flags 

    Don’t add -liconv to LDFLAGS automatically so that GHC will add it
itself.

This was previously done in other compilers but this one is missing it.
    @matthewbauer
    matthewbauer committed Mar 4, 2019
    Copy the full SHA
    3e02e7f View commit details
Showing with 6 additions and 0 deletions.
  1. +3 −0 pkgs/development/compilers/ghc/8.4.3.nix
  2. +3 −0 pkgs/development/compilers/ghc/8.6.3.nix
3 changes: 3 additions & 0 deletions pkgs/development/compilers/ghc/8.4.3.nix
View file
Original file line number Diff line number Diff line change
@@ -182,6 +182,9 @@ stdenv.mkDerivation (rec {
# Make sure we never relax`$PATH` and hooks support for compatability.
strictDeps = true;

# Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
dontAddExtraLibs = true;

nativeBuildInputs = [
perl autoconf automake m4 python3
ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
3 changes: 3 additions & 0 deletions pkgs/development/compilers/ghc/8.6.3.nix
View file
Original file line number Diff line number Diff line change
@@ -167,6 +167,9 @@ stdenv.mkDerivation (rec {
# Make sure we never relax`$PATH` and hooks support for compatability.
strictDeps = true;

# Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
dontAddExtraLibs = true;

nativeBuildInputs = [
perl autoconf automake m4 python3 sphinx
ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour