diff options
| author | John Ericson <git@JohnEricson.me> | 2018-12-01 02:23:43 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-01 02:23:43 -0500 |
| commit | 62a1bc003113bbd30f71287f7b8047d02d8ee73b (patch) | |
| tree | b45e146ed8a78c74b4c16fbbafb8d6137c884f96 /pkgs | |
| parent | 50bb0afa7cec45221470f384690cd94000a4f408 (diff) | |
| parent | 7fa0befcc7d495ae3dc193559c1418c0b1efa09f (diff) | |
| download | nixpkgs-62a1bc003113bbd30f71287f7b8047d02d8ee73b.tar nixpkgs-62a1bc003113bbd30f71287f7b8047d02d8ee73b.tar.gz nixpkgs-62a1bc003113bbd30f71287f7b8047d02d8ee73b.tar.bz2 nixpkgs-62a1bc003113bbd30f71287f7b8047d02d8ee73b.tar.lz nixpkgs-62a1bc003113bbd30f71287f7b8047d02d8ee73b.tar.xz nixpkgs-62a1bc003113bbd30f71287f7b8047d02d8ee73b.tar.zst nixpkgs-62a1bc003113bbd30f71287f7b8047d02d8ee73b.zip | |
Merge pull request #51307 from expipiplus1/ghc-arm
ghc-8.4: fix build targeting arm
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/ghc/8.4.4.nix | 6 |
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 c84ea1d84d5..1ea18149d1e 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 ."; |