summary refs log tree commit diff
path: root/pkgs/development/compilers/ghc/8.2.2.nix
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2018-05-22 17:48:29 +0300
committerTuomas Tynkkynen <tuomas@tuxera.com>2018-05-22 17:48:29 +0300
commitf9feacfc7c389bacb937e24d7cccfe013271efaa (patch)
tree264c2e15652058f1f1dc16fa4739d453c533ba58 /pkgs/development/compilers/ghc/8.2.2.nix
parentdb4d77779c9b52a35c5a4306d36e2727cba1b162 (diff)
parentc8a4562f5966e90cbbe04195b4a37a5d4a334f60 (diff)
downloadnixlib-f9feacfc7c389bacb937e24d7cccfe013271efaa.tar
nixlib-f9feacfc7c389bacb937e24d7cccfe013271efaa.tar.gz
nixlib-f9feacfc7c389bacb937e24d7cccfe013271efaa.tar.bz2
nixlib-f9feacfc7c389bacb937e24d7cccfe013271efaa.tar.lz
nixlib-f9feacfc7c389bacb937e24d7cccfe013271efaa.tar.xz
nixlib-f9feacfc7c389bacb937e24d7cccfe013271efaa.tar.zst
nixlib-f9feacfc7c389bacb937e24d7cccfe013271efaa.zip
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/development/compilers/ghc/8.2.2.nix')
-rw-r--r--pkgs/development/compilers/ghc/8.2.2.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix
index f52bd4a505e9..0d4e5d8ee670 100644
--- a/pkgs/development/compilers/ghc/8.2.2.nix
+++ b/pkgs/development/compilers/ghc/8.2.2.nix
@@ -99,7 +99,8 @@ stdenv.mkDerivation rec {
     (fetchpatch { # Backport of https://phabricator.haskell.org/D4388 for more determinism
       url = "https://github.com/shlevy/ghc/commit/fec1b8d3555c447c0d8da0e96b659be67c8bb4bc.patch";
       sha256 = "1lyysz6hfd1njcigpm8xppbnkadqfs0kvrp7s8vqgb38pjswj5hg";
-    });
+    })
+    ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch;
 
   postPatch = "patchShebangs .";