diff options
| author | Peter Simons <simons@cryp.to> | 2015-10-28 11:35:03 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2015-10-28 11:35:03 +0100 |
| commit | af1237688e28b4f01f5e1fb69fe726cacaeafaa7 (patch) | |
| tree | 3c93b0c16258bb25030148408a2d43c0218395d8 | |
| parent | be1fa3c9dac0989b20a4fcc8bbe23556774cf797 (diff) | |
| parent | cbc666fc609f4cc99a029a2ca9f0ddf366c5e629 (diff) | |
Merge pull request #10605 from LnL7/haskell-darwin
haskell: added darwin frameworks for stack and halive
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6a6286793238d..089ad34dee4a1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -183,13 +183,17 @@ self: super: { # https://github.com/haskell/vector/issues/47 vector = if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector; + halive = if pkgs.stdenv.isDarwin + then addBuildDepend super.halive pkgs.darwin.apple_sdk.frameworks.AppKit + else super.halive; + # cabal2nix likes to generate dependencies on hinotify when hfsevents is really required # on darwin: https://github.com/NixOS/cabal2nix/issues/146. hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else super.hinotify; # hfsevents needs CoreServices in scope hfsevents = if pkgs.stdenv.isDarwin - then addBuildTool super.hfsevents pkgs.darwin.apple_sdk.frameworks.CoreServices + then with pkgs.darwin.apple_sdk.frameworks; addBuildTool (addBuildDepends super.hfsevents [Cocoa]) CoreServices else super.hfsevents; # FSEvents API is very buggy and tests are unreliable. See |