From c981f0f2c99b6fbc8d7e288279615e23402bedce Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 13 Nov 2024 21:45:57 +0000 Subject: [PATCH] watchman: clean up inputs (cherry picked from commit f7f5d1a9473a3fafc5aa8f685e9e364d97548fc5) (cherry picked from commit e24c6b93b96012a061ee2c024b3c23627bd5e0ac) --- pkgs/by-name/wa/watchman/package.nix | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/wa/watchman/package.nix b/pkgs/by-name/wa/watchman/package.nix index 57ec17947096..300305d8efd4 100644 --- a/pkgs/by-name/wa/watchman/package.nix +++ b/pkgs/by-name/wa/watchman/package.nix @@ -14,6 +14,7 @@ pcre2, openssl, + gflags, glog, libevent, edencommon, @@ -23,15 +24,11 @@ fbthrift, fb303, cpptoml, - gtest, - libunwind, - libsodium, - double-conversion, - lz4, - zstd, apple-sdk_11, darwinMinVersionHook, + gtest, + stateDir ? "/tmp", }: @@ -67,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: { [ pcre2 openssl + gflags glog libevent edencommon @@ -76,18 +74,16 @@ stdenv.mkDerivation (finalAttrs: { fbthrift fb303 cpptoml - gtest - libsodium - libunwind - double-conversion - lz4 - zstd ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 (darwinMinVersionHook "11.0") ]; + checkInputs = [ + gtest + ]; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DENABLE_EDEN_SUPPORT=NO" # requires sapling (formerly known as eden), which is not packaged in nixpkgs