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

watchman: remove cf-private

Browse Source
This commit is contained in:
Daiderd Jordan 2019-06-19 19:55:22 +02:00
parent e7765ba8e5
commit c2205238ab
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,12 +1,11 @@
{ 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 , withApple ? stdenv.isDarwin, CoreServices
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "watchman-${version}"; name = "watchman-${version}";
version = "4.9.0"; version = "4.9.0";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -16,18 +15,18 @@ stdenv.mkDerivation rec {
sha256 = "0fdaj5pmicm6j17d5q7px800m5rmam1a400x3hv1iiifnmhgnkal"; sha256 = "0fdaj5pmicm6j17d5q7px800m5rmam1a400x3hv1iiifnmhgnkal";
}; };
buildInputs = [ pcre openssl ]
++ lib.optionals withApple [ CoreFoundation CoreServices ];
nativeBuildInputs = [ autoconf automake pkgconfig libtool ]; nativeBuildInputs = [ autoconf automake pkgconfig libtool ];
buildInputs = [ pcre openssl ]
++ lib.optionals withApple [ CoreServices ];
configureFlags = [ configureFlags = [
"--enable-lenient" "--enable-lenient"
"--enable-conffile=${if confFile == null then "no" else confFile}" "--enable-conffile=${if confFile == null then "no" else confFile}"
"--with-pcre=yes" "--with-pcre=yes"
# For security considerations re: --disable-statedir, see: # For security considerations re: --disable-statedir, see:
# https://github.com/facebook/watchman/issues/178 # https://github.com/facebook/watchman/issues/178
"--disable-statedir" "--disable-statedir"
]; ];
prePatch = '' prePatch = ''

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

@ -6558,7 +6558,6 @@ in
watchman = callPackage ../development/tools/watchman { watchman = callPackage ../development/tools/watchman {
inherit (darwin.apple_sdk.frameworks) CoreServices; inherit (darwin.apple_sdk.frameworks) CoreServices;
CoreFoundation = darwin.cf-private;
}; };
wavefunctioncollapse = callPackage ../tools/graphics/wavefunctioncollapse {}; wavefunctioncollapse = callPackage ../tools/graphics/wavefunctioncollapse {};