diff options
| author | John Ericson <Ericson2314@Yahoo.com> | 2017-09-15 15:13:37 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-01-21 23:31:04 -0500 |
| commit | 60f45a2af12abb27d6c3c55d3685cf405b39c8ff (patch) | |
| tree | 9d04255c866a9193f2fee8890e84b47c753716e8 /pkgs/development | |
| parent | af03b7746a549c3cfbf5052d501dc382b805d8e3 (diff) | |
| download | nixpkgs-60f45a2af12abb27d6c3c55d3685cf405b39c8ff.tar nixpkgs-60f45a2af12abb27d6c3c55d3685cf405b39c8ff.tar.gz nixpkgs-60f45a2af12abb27d6c3c55d3685cf405b39c8ff.tar.bz2 nixpkgs-60f45a2af12abb27d6c3c55d3685cf405b39c8ff.tar.lz nixpkgs-60f45a2af12abb27d6c3c55d3685cf405b39c8ff.tar.xz nixpkgs-60f45a2af12abb27d6c3c55d3685cf405b39c8ff.tar.zst nixpkgs-60f45a2af12abb27d6c3c55d3685cf405b39c8ff.zip | |
ghc 8.0.2: Patch Cabal so --extra-*-dirs works right
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/compilers/ghc/8.0.2.nix | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index 36e2fd0d4c0..1625d6d0ef0 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -3,7 +3,7 @@ # build-tools , bootPkgs, hscolour -, coreutils, fetchurl, perl, sphinx +, coreutils, fetchpatch, fetchurl, perl, sphinx , libffi, libiconv ? null, ncurses @@ -75,8 +75,15 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "doc" ]; - patches = [ ./ghc-gold-linker.patch ] - ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch + patches = [ + ./ghc-gold-linker.patch + (fetchpatch { # Unreleased 1.24.x commit + url = "https://github.com/haskell/cabal/commit/6394cb0b6eba91a8692a3d04b2b56935aed7cccd.patch"; + sha256 = "14xxjg0nb1j1pw0riac3v385ka92qhxxblfmwyvbghz7kry6axy0"; + stripLen = 1; + extraPrefix = "libraries/Cabal/"; + }) + ] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch ++ stdenv.lib.optional stdenv.isDarwin ./ghc-8.0.2-no-cpp-warnings.patch; # GHC is a bit confused on its cross terminology. |