From e9e5260a6e4eff03f68f6d9045f52adc2c60360b Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 6 Jan 2025 23:31:55 +0000
Subject: [PATCH] =?UTF-8?q?watchman:=20add=20patch=20for=20glog=20?=
 =?UTF-8?q?=E2=89=A5=200.7.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/wa/watchman/glog-0.7.patch | 21 +++++++++++++++++++++
 pkgs/by-name/wa/watchman/package.nix    |  4 ++++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/by-name/wa/watchman/glog-0.7.patch

diff --git a/pkgs/by-name/wa/watchman/glog-0.7.patch b/pkgs/by-name/wa/watchman/glog-0.7.patch
new file mode 100644
index 0000000000000..30eaa67b424ef
--- /dev/null
+++ b/pkgs/by-name/wa/watchman/glog-0.7.patch
@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dd6eec3320..ee74ab0008 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -333,7 +333,7 @@
+ find_package(Gflags REQUIRED)
+ include_directories(SYSTEM ${GFLAGS_INCLUDE_DIR})
+ 
+-find_package(Glog REQUIRED)
++find_package(Glog CONFIG REQUIRED)
+ add_compile_definitions(GLOG_NO_ABBREVIATED_SEVERITIES)
+ 
+ # We indirectly depend on boost.  This logic needs to match
+@@ -479,7 +479,6 @@
+ )
+ target_include_directories(third_party_deps INTERFACE
+   ${FOLLY_INCLUDE_DIR}
+-  ${GLOG_INCLUDE_DIR}
+   ${GFLAGS_INCLUDE_DIR}
+   ${Boost_INCLUDE_DIRS}
+ )
diff --git a/pkgs/by-name/wa/watchman/package.nix b/pkgs/by-name/wa/watchman/package.nix
index 6f8eb1050632f..50d155809a400 100644
--- a/pkgs/by-name/wa/watchman/package.nix
+++ b/pkgs/by-name/wa/watchman/package.nix
@@ -45,6 +45,10 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-W37+xs+Fj2yL9KzR9CugfgbFl+g3f+2Dx+xL9MpQEQ4=";
   };
 
+  patches = [
+    ./glog-0.7.patch
+  ];
+
   nativeBuildInputs = [
     cmake
     ninja