diff options
| author | Daiderd Jordan <daiderd.jordan@hgst.com> | 2015-10-27 22:49:08 +0100 |
|---|---|---|
| committer | Daiderd Jordan <daiderd.jordan@hgst.com> | 2015-10-27 22:49:08 +0100 |
| commit | cbc666fc609f4cc99a029a2ca9f0ddf366c5e629 (patch) | |
| tree | 88d6e3cddee53d69fb7801b22ff9ff7f88b6d083 /pkgs/development/haskell-modules | |
| parent | ea42c98850ad5c2e3ec5bbf2bd9f2880d43c2ada (diff) | |
| download | nixlib-cbc666fc609f4cc99a029a2ca9f0ddf366c5e629.tar nixlib-cbc666fc609f4cc99a029a2ca9f0ddf366c5e629.tar.gz nixlib-cbc666fc609f4cc99a029a2ca9f0ddf366c5e629.tar.bz2 nixlib-cbc666fc609f4cc99a029a2ca9f0ddf366c5e629.tar.lz nixlib-cbc666fc609f4cc99a029a2ca9f0ddf366c5e629.tar.xz nixlib-cbc666fc609f4cc99a029a2ca9f0ddf366c5e629.tar.zst nixlib-cbc666fc609f4cc99a029a2ca9f0ddf366c5e629.zip | |
fixed darwin frameworks for halive and fsevents
Diffstat (limited to 'pkgs/development/haskell-modules')
| -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 6a6286793238..089ad34dee4a 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 |