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

watchman: add fsevents support

Browse Source 
macOS needs apple sdks for fsevents support

Fixes #14309
This commit is contained in:
Matthew Bauer 2018-05-15 23:16:15 -05:00
parent b19c92be90
commit d6c9efa223
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/watchman/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv, lib, config, fetchFromGitHub, autoconf, automake, pcre, { stdenv, lib, config, fetchFromGitHub, autoconf, automake, pcre,
libtool, pkgconfig, openssl, libtool, pkgconfig, openssl,
confFile ? config.watchman.confFile or null confFile ? config.watchman.confFile or null,
withApple ? stdenv.isDarwin, CoreServices, CoreFoundation
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,7 +16,8 @@ stdenv.mkDerivation rec {
sha256 = "0fdaj5pmicm6j17d5q7px800m5rmam1a400x3hv1iiifnmhgnkal"; sha256 = "0fdaj5pmicm6j17d5q7px800m5rmam1a400x3hv1iiifnmhgnkal";
}; };
buildInputs = [ pcre openssl ]; buildInputs = [ pcre openssl ]
++ lib.optionals withApple [ CoreFoundation CoreServices ];
nativeBuildInputs = [ autoconf automake pkgconfig libtool ]; nativeBuildInputs = [ autoconf automake pkgconfig libtool ];
configureFlags = [ configureFlags = [

5
pkgs/top-level/all-packages.nix
View File

@ -5481,7 +5481,10 @@ with pkgs;
watchexec = callPackage ../tools/misc/watchexec { }; 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 {}; wavefunctioncollapse = callPackage ../tools/graphics/wavefunctioncollapse {};