watchman: add patch for glog ≥ 0.7.0

NixOS · Jan 6, 2025 · e9e5260 · e9e5260
1 parent ab6e427
commit e9e5260
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/pkgs/by-name/wa/watchman/glog-0.7.patch 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
@@ -45,6 +45,10 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-W37+xs+Fj2yL9KzR9CugfgbFl+g3f+2Dx+xL9MpQEQ4=";
   };
 
+  patches = [
+    ./glog-0.7.patch
+  ];
+
   nativeBuildInputs = [
     cmake
     ninja