From d6c9efa223a9bb39b38378b5ee5e7b5490a70071 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 15 May 2018 23:16:15 -0500 Subject: [PATCH] watchman: add fsevents support macOS needs apple sdks for fsevents support Fixes #14309 --- pkgs/development/tools/watchman/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix index 15f265e31e3f..b349ecf61e13 100644 --- a/pkgs/development/tools/watchman/default.nix +++ b/pkgs/development/tools/watchman/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, config, fetchFromGitHub, autoconf, automake, pcre, libtool, pkgconfig, openssl, - confFile ? config.watchman.confFile or null + confFile ? config.watchman.confFile or null, + withApple ? stdenv.isDarwin, CoreServices, CoreFoundation }: stdenv.mkDerivation rec { @@ -15,7 +16,8 @@ stdenv.mkDerivation rec { sha256 = "0fdaj5pmicm6j17d5q7px800m5rmam1a400x3hv1iiifnmhgnkal"; }; - buildInputs = [ pcre openssl ]; + buildInputs = [ pcre openssl ] + ++ lib.optionals withApple [ CoreFoundation CoreServices ]; nativeBuildInputs = [ autoconf automake pkgconfig libtool ]; configureFlags = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa6cbc7a4d31..c573bc6fabc1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5481,7 +5481,10 @@ with pkgs; watchexec = callPackage ../tools/misc/watchexec { }; - watchman = callPackage ../development/tools/watchman { }; + watchman = callPackage ../development/tools/watchman { + inherit (darwin.apple_sdk.frameworks) CoreServices; + CoreFoundation = darwin.cf-private; + }; wavefunctioncollapse = callPackage ../tools/graphics/wavefunctioncollapse {};