JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed darwin frameworks for halive and fsevents

Browse Source
This commit is contained in:
Daiderd Jordan 2015-10-27 22:49:08 +01:00
parent ea42c98850
commit cbc666fc60
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -183,13 +183,17 @@ self: super: {
# https://github.com/haskell/vector/issues/47 # https://github.com/haskell/vector/issues/47
vector = if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector; 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 # cabal2nix likes to generate dependencies on hinotify when hfsevents is really required
# on darwin: https://github.com/NixOS/cabal2nix/issues/146. # on darwin: https://github.com/NixOS/cabal2nix/issues/146.
hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else super.hinotify; hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else super.hinotify;
# hfsevents needs CoreServices in scope # hfsevents needs CoreServices in scope
hfsevents = if pkgs.stdenv.isDarwin 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; else super.hfsevents;
# FSEvents API is very buggy and tests are unreliable. See # FSEvents API is very buggy and tests are unreliable. See