diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-22 12:24:35 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-01-21 23:31:04 -0500 |
| commit | 23c29ebc9041c2bfd91f3b680c68ad81430a3ee2 (patch) | |
| tree | 22376b8fffd1ebe768341814be11b309c9a8b7df /pkgs/development/compilers/ghc | |
| parent | 60f45a2af12abb27d6c3c55d3685cf405b39c8ff (diff) | |
| download | nixlib-23c29ebc9041c2bfd91f3b680c68ad81430a3ee2.tar nixlib-23c29ebc9041c2bfd91f3b680c68ad81430a3ee2.tar.gz nixlib-23c29ebc9041c2bfd91f3b680c68ad81430a3ee2.tar.bz2 nixlib-23c29ebc9041c2bfd91f3b680c68ad81430a3ee2.tar.lz nixlib-23c29ebc9041c2bfd91f3b680c68ad81430a3ee2.tar.xz nixlib-23c29ebc9041c2bfd91f3b680c68ad81430a3ee2.tar.zst nixlib-23c29ebc9041c2bfd91f3b680c68ad81430a3ee2.zip | |
ghc 8.2.2: Add bgamari's STRIP detection fix
Diffstat (limited to 'pkgs/development/compilers/ghc')
| -rw-r--r-- | pkgs/development/compilers/ghc/8.2.2.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index f4e2c5577204..105f80b4eff8 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -3,7 +3,7 @@ # build-tools , bootPkgs, alex, happy, hscolour -, autoconf, automake, coreutils, fetchurl, perl, python3, sphinx +, autoconf, autoreconfHook, automake, coreutils, fetchurl, fetchpatch, perl, python3, sphinx , libffi, libiconv ? null, ncurses @@ -80,6 +80,13 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; + patches = [ + (fetchpatch { # Fix STRIP to be substituted from configure + url = "https://git.haskell.org/ghc.git/commitdiff_plain/2fc8ce5f0c8c81771c26266ac0b150ca9b75c5f3"; + sha256 = "03253ci40np1v6k0wmi4aypj3nmj3rdyvb1k6rwqipb30nfc719f"; + }) + ]; + postPatch = "patchShebangs ."; # GHC is a bit confused on its cross terminology. @@ -135,7 +142,7 @@ stdenv.mkDerivation rec { # masss-rebuild. crossConfig = true; - nativeBuildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ]; + nativeBuildInputs = [ alex autoconf autoreconfHook automake ghc happy hscolour perl python3 sphinx ]; # For building runtime libs depsBuildTarget = toolsForTarget; |