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

---
 pkgs/by-name/mv/mvfst/glog-0.7.patch | 26 ++++++++++++++++++++++++++
 pkgs/by-name/mv/mvfst/package.nix    |  4 ++++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/by-name/mv/mvfst/glog-0.7.patch

diff --git a/pkgs/by-name/mv/mvfst/glog-0.7.patch b/pkgs/by-name/mv/mvfst/glog-0.7.patch
new file mode 100644
index 000000000000..0f72a615b98e
--- /dev/null
+++ b/pkgs/by-name/mv/mvfst/glog-0.7.patch
@@ -0,0 +1,26 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a878c7c473..c76c989f91 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -52,7 +52,7 @@
+ find_package(fmt REQUIRED)
+ find_package(folly REQUIRED)
+ find_package(Fizz REQUIRED)
+-find_package(Glog REQUIRED)
++find_package(Glog CONFIG REQUIRED)
+ find_package(Threads)
+ 
+ SET(GFLAG_DEPENDENCIES "")
+diff --git a/cmake/QuicTest.cmake b/cmake/QuicTest.cmake
+index e7d9f0c0c3..5f4525189c 100644
+--- a/cmake/QuicTest.cmake
++++ b/cmake/QuicTest.cmake
+@@ -50,7 +50,7 @@
+   target_link_libraries(${QUIC_TEST_TARGET} PUBLIC
+     "${QUIC_TEST_DEPENDS}"
+     ${LIBGMOCK_LIBRARIES}
+-    ${GLOG_LIBRARY}
++    glog::glog
+   )
+ 
+   # Per https://github.com/facebook/mvfst/pull/9, disable some warnings
diff --git a/pkgs/by-name/mv/mvfst/package.nix b/pkgs/by-name/mv/mvfst/package.nix
index 7823ea3ab2e6..0179fa3621e7 100644
--- a/pkgs/by-name/mv/mvfst/package.nix
+++ b/pkgs/by-name/mv/mvfst/package.nix
@@ -36,6 +36,10 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-xgqVksPcm9CStAK32oNz7DT0CVzFb8ANohNxtyP0iT0=";
   };
 
+  patches = [
+    ./glog-0.7.patch
+  ];
+
   nativeBuildInputs = [
     cmake
     ninja