From b47bfcac940720362115d2fb885447ff55dd10db Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 6 Jan 2025 22:29:46 +0000 Subject: [PATCH] =?UTF-8?q?fizz:=20add=20patch=20for=20glog=20=E2=89=A5=20?= =?UTF-8?q?0.7.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/fi/fizz/glog-0.7.patch | 30 +++++++++++++++++++++++++++++ pkgs/by-name/fi/fizz/package.nix | 4 ++++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/by-name/fi/fizz/glog-0.7.patch diff --git a/pkgs/by-name/fi/fizz/glog-0.7.patch b/pkgs/by-name/fi/fizz/glog-0.7.patch new file mode 100644 index 000000000000..263cce53baa9 --- /dev/null +++ b/pkgs/by-name/fi/fizz/glog-0.7.patch @@ -0,0 +1,30 @@ +diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt +index c60177c2b9..425326c529 100644 +--- a/fizz/CMakeLists.txt ++++ b/fizz/CMakeLists.txt +@@ -50,7 +50,7 @@ + find_package(fmt CONFIG REQUIRED) + + find_package(OpenSSL REQUIRED) +-find_package(Glog REQUIRED) ++find_package(Glog CONFIG REQUIRED) + find_package(Threads REQUIRED) + find_package(Zstd REQUIRED) + if (UNIX AND NOT APPLE) +@@ -198,7 +198,6 @@ + ${sodium_INCLUDE_DIR} + ${ZSTD_INCLUDE_DIR} + PRIVATE +- ${GLOG_INCLUDE_DIRS} + ${FIZZ_INCLUDE_DIRECTORIES} + ) + +@@ -212,7 +211,7 @@ + ZLIB::ZLIB + ${ZSTD_LIBRARY} + PRIVATE +- ${GLOG_LIBRARIES} ++ glog::glog + ${GFLAGS_LIBRARIES} + ${FIZZ_LINK_LIBRARIES} + ${CMAKE_DL_LIBS} diff --git a/pkgs/by-name/fi/fizz/package.nix b/pkgs/by-name/fi/fizz/package.nix index 7079baf88e2a..3d09d856ef4f 100644 --- a/pkgs/by-name/fi/fizz/package.nix +++ b/pkgs/by-name/fi/fizz/package.nix @@ -41,6 +41,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ENMWP4CkJHe6Z0qsRNkmgw8NcYQvduAs7jIZLwirsCs="; }; + patches = [ + ./glog-0.7.patch + ]; + nativeBuildInputs = [ cmake ninja