summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJoe Hermaszewski <git@monoid.al>2018-12-01 09:38:42 +0800
committerJoe Hermaszewski <git@monoid.al>2018-12-01 12:09:05 +0800
commit7fa0befcc7d495ae3dc193559c1418c0b1efa09f (patch)
tree1c078a876c8eef59df35781c48994c3fb3b9b4ef /pkgs
parent80738ed9dc0ce48d7796baed5364eef8072c794d (diff)
downloadnixpkgs-7fa0befcc7d495ae3dc193559c1418c0b1efa09f.tar
nixpkgs-7fa0befcc7d495ae3dc193559c1418c0b1efa09f.tar.gz
nixpkgs-7fa0befcc7d495ae3dc193559c1418c0b1efa09f.tar.bz2
nixpkgs-7fa0befcc7d495ae3dc193559c1418c0b1efa09f.tar.lz
nixpkgs-7fa0befcc7d495ae3dc193559c1418c0b1efa09f.tar.xz
nixpkgs-7fa0befcc7d495ae3dc193559c1418c0b1efa09f.tar.zst
nixpkgs-7fa0befcc7d495ae3dc193559c1418c0b1efa09f.zip
ghc-8.4: fix build targeting arm
Fixes https://ghc.haskell.org/trac/ghc/ticket/15780
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/compilers/ghc/8.4.4.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix
index 32a9095e123..901582b7a92 100644
--- a/pkgs/development/compilers/ghc/8.4.4.nix
+++ b/pkgs/development/compilers/ghc/8.4.4.nix
@@ -109,7 +109,11 @@ stdenv.mkDerivation (rec {
       name = "D4388.diff";
       sha256 = "0w6sdcvnqjlnlzpvnzw20b80v150ijjyjvs9548ildc1928j0w7s";
     })
-    ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch;
+    ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch
+    ++ stdenv.lib.optional (targetPlatform.isAarch32 || targetPlatform.isAarch64) (fetchpatch {
+      url = "https://git.haskell.org/ghc.git/patch/d8495549ba9d194815c2d0eaee6797fc7c00756a";
+      sha256 = "1czx12qcl088vjn7mqxvyja4b2ia2n09c28br8c777fd0xk069pm";
+    });
 
   postPatch = "patchShebangs .";