From 8ddc3eb988e73d75fc72532a2d36af1d95e494a6 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Thu, 24 Aug 2017 18:17:27 +0200 Subject: [PATCH] watchman: 4.7.0 -> 4.9.0 --- pkgs/development/tools/watchman/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix index 379f87b4cf4f..15f265e31e3f 100644 --- a/pkgs/development/tools/watchman/default.nix +++ b/pkgs/development/tools/watchman/default.nix @@ -1,20 +1,22 @@ -{ stdenv, lib, config, fetchFromGitHub, autoconf, automake, pcre -, confFile ? config.watchman.confFile or null +{ stdenv, lib, config, fetchFromGitHub, autoconf, automake, pcre, + libtool, pkgconfig, openssl, + confFile ? config.watchman.confFile or null }: stdenv.mkDerivation rec { name = "watchman-${version}"; - version = "4.7.0"; + version = "4.9.0"; src = fetchFromGitHub { owner = "facebook"; repo = "watchman"; rev = "v${version}"; - sha256 = "0xnd7jvrmyxhlw2ggd37swv1mk6vw9j91fdxps6njgvnlfg9zs5n"; + sha256 = "0fdaj5pmicm6j17d5q7px800m5rmam1a400x3hv1iiifnmhgnkal"; }; - buildInputs = [ autoconf automake pcre ]; + buildInputs = [ pcre openssl ]; + nativeBuildInputs = [ autoconf automake pkgconfig libtool ]; configureFlags = [ "--enable-lenient" @@ -26,6 +28,10 @@ stdenv.mkDerivation rec { "--disable-statedir" ]; + prePatch = '' + patchShebangs . + ''; + preConfigure = '' ./autogen.sh '';