diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2019-06-19 19:55:22 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2019-07-03 22:20:13 +0200 |
| commit | c2205238abde57996e4aba1085c4e76bbeb529c3 (patch) | |
| tree | 0d6f9a9a90d67d4e41befebc9e82fecd5abbec64 /pkgs/development/tools/watchman | |
| parent | e7765ba8e5ca5731ea8c5d6bb44b5d7d0214f7f1 (diff) | |
| download | nixpkgs-c2205238abde57996e4aba1085c4e76bbeb529c3.tar nixpkgs-c2205238abde57996e4aba1085c4e76bbeb529c3.tar.gz nixpkgs-c2205238abde57996e4aba1085c4e76bbeb529c3.tar.bz2 nixpkgs-c2205238abde57996e4aba1085c4e76bbeb529c3.tar.lz nixpkgs-c2205238abde57996e4aba1085c4e76bbeb529c3.tar.xz nixpkgs-c2205238abde57996e4aba1085c4e76bbeb529c3.tar.zst nixpkgs-c2205238abde57996e4aba1085c4e76bbeb529c3.zip | |
watchman: remove cf-private
Diffstat (limited to 'pkgs/development/tools/watchman')
| -rw-r--r-- | pkgs/development/tools/watchman/default.nix | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix index b349ecf61e1..4a056db6c0c 100644 --- a/pkgs/development/tools/watchman/default.nix +++ b/pkgs/development/tools/watchman/default.nix @@ -1,12 +1,11 @@ -{ stdenv, lib, config, fetchFromGitHub, autoconf, automake, pcre, - libtool, pkgconfig, openssl, - confFile ? config.watchman.confFile or null, - withApple ? stdenv.isDarwin, CoreServices, CoreFoundation +{ stdenv, lib, config, fetchFromGitHub, autoconf, automake, pcre +, libtool, pkgconfig, openssl +, confFile ? config.watchman.confFile or null +, withApple ? stdenv.isDarwin, CoreServices }: stdenv.mkDerivation rec { name = "watchman-${version}"; - version = "4.9.0"; src = fetchFromGitHub { @@ -16,18 +15,18 @@ stdenv.mkDerivation rec { sha256 = "0fdaj5pmicm6j17d5q7px800m5rmam1a400x3hv1iiifnmhgnkal"; }; - buildInputs = [ pcre openssl ] - ++ lib.optionals withApple [ CoreFoundation CoreServices ]; nativeBuildInputs = [ autoconf automake pkgconfig libtool ]; + buildInputs = [ pcre openssl ] + ++ lib.optionals withApple [ CoreServices ]; configureFlags = [ - "--enable-lenient" - "--enable-conffile=${if confFile == null then "no" else confFile}" - "--with-pcre=yes" + "--enable-lenient" + "--enable-conffile=${if confFile == null then "no" else confFile}" + "--with-pcre=yes" - # For security considerations re: --disable-statedir, see: - # https://github.com/facebook/watchman/issues/178 - "--disable-statedir" + # For security considerations re: --disable-statedir, see: + # https://github.com/facebook/watchman/issues/178 + "--disable-statedir" ]; prePatch = '' |