From cbc666fc609f4cc99a029a2ca9f0ddf366c5e629 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 27 Oct 2015 22:49:08 +0100 Subject: [PATCH] fixed darwin frameworks for halive and fsevents --- pkgs/development/haskell-modules/configuration-common.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6a628679323..089ad34dee4 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